Merge branch 'master' of gitorious.org:manaplus/manaplus

author: Reid <reidyaro@gmail.com> 2011-08-24 22:42:17 +0200
committer: Reid <reidyaro@gmail.com> 2011-08-24 22:42:17 +0200
commit: 43c19a8321bd0c4bcf36655d74e895397aff7eea (patch)
tree: c8f7933367ae1e757a3166a04772274896d58c9c
parent: c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff)
parent: 9505e3789cc9db6a10a68b9794a586604271b76f (diff)
download: plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz
plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2
plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz
plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip
320 files changed, 95021 insertions, 61814 deletions
diff --git a/ChangeLog b/ChangeLog
index 96897a843..b0ad8f4bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2011-08-21 New release 1.1.8.21
+ManaPlus:
+fix: moving near npc.
+fix: crash in server dialog if press load button twice.
+fix: saving opened whisper tabs.
+fix: hide/show setup window by hot key.
+fix: show shop sign on players only if shop enabled and shop not empty.
+fix: chat auto scroll.
+fix: mode with switching bow to knife.
+fix: adding limits to adding items to trade.
+fix: perfomance issue with invisible npcs.
+add: auto improve perfomance by disabling different draphics features.
+add: perfomance tab. most perfomance related settings moved to this tab.
+add: new perfomance related options to perfomance tab.
+add: split players setup tab to relations and players.
+add: ability to add comments to npcs.
+add: option to hide ip addresses on screen shots.
+add: warp menu item navigation points menu (for gms only).
+add: copy to chat button in status window to copy player stats to chat.
+add: enable auto switching to janapese font if used japan locale.
+add: update dejavu and mplus fonts.
+add: updated translations.
+
 2011-08-07 New release 1.1.8.7
 ManaPlus:
 fix: player attack animation length.
diff --git a/README b/README
index 90d368360..3f2cb5244 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.8.7        Date: 2011-08-07
+ Version: 1.1.8.21        Date: 2011-08-21
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index ab33f1c91..b9ad19133 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.8.7        Date: 2011-08-07
+ Version: 1.1.8.21        Date: 2011-08-21
 
  Development team:
   - See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index d893b7e7c..cd70c8d2d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.8.7], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.8.21], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf
index 5808f5e51..e5991cc44 100644
--- a/data/fonts/dejavusans-bold.ttf
+++ b/data/fonts/dejavusans-bold.ttf
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
index 4c9b0aa55..072c14e76 100644
--- a/data/fonts/dejavusans.ttf
+++ b/data/fonts/dejavusans.ttf
diff --git a/data/fonts/dejavusansmono-bold.ttf b/data/fonts/dejavusansmono-bold.ttf
index f9c8026b3..a2bd7b0da 100644
--- a/data/fonts/dejavusansmono-bold.ttf
+++ b/data/fonts/dejavusansmono-bold.ttf
diff --git a/data/fonts/dejavusansmono.ttf b/data/fonts/dejavusansmono.ttf
index f1cc7a34e..4e0848b4b 100644
--- a/data/fonts/dejavusansmono.ttf
+++ b/data/fonts/dejavusansmono.ttf
diff --git a/data/fonts/mplus-1p-bold.ttf b/data/fonts/mplus-1p-bold.ttf
index 75bca9845..ca127dd28 100644
--- a/data/fonts/mplus-1p-bold.ttf
+++ b/data/fonts/mplus-1p-bold.ttf
diff --git a/data/fonts/mplus-1p-regular.ttf b/data/fonts/mplus-1p-regular.ttf
index 340b6705e..9c71c2ef3 100644
--- a/data/fonts/mplus-1p-regular.ttf
+++ b/data/fonts/mplus-1p-regular.ttf
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index df42dcdfd..2091494b3 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#f48055" />
 	<color id="GUILD_SOCIAL_TAB" color="#f48055" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#ebc873" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#000000" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#003000" />
diff --git a/data/help/tips/13.txt b/data/help/tips/13.txt
index da68593f6..5587cff28 100644
--- a/data/help/tips/13.txt
+++ b/data/help/tips/13.txt
@@ -1,2 +1,2 @@
 You can use mumble voice chat for talking with other players.
-Start mumble before client start and enable mumber in settings.
+Start mumble before client start and enable mumble in settings.
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 51eba63fe..ef06fdc9f 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#7a7972" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#361c00" />
 	<color id="TAB_FLASH" color="#000000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#744c04" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#00ff00" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index e7ab17da2..f4ae878e4 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,16 +12,20 @@
 	<color id="GUILD_CHAT_TAB" color="#f48055" />
 	<color id="GUILD_SOCIAL_TAB" color="#f48055" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#ebc873" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#000000" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#009000" />
 	<color id="WHISPER" color="#0000ff" />
-    <color id="WHISPER_OFFLINE" color="#000050" />
+	<color id="WHISPER_OFFLINE" color="#000050" />
 	<color id="IS" color="#705000" />
 	<color id="SERVER" color="#8415e2" />
 	<color id="LOGGER" color="#919191" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 557ba34d5..c623b8396 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#c0c0c0" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#000000" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#003000" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index b49be8015..6be3ab630 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#FF00FF" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#FF00FF" />
 	<color id="BUTTON_DISABLED" color="#FF00FF" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#f48055" />
 	<color id="GUILD_SOCIAL_TAB" color="#f48055" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#FFFEFF" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#FF00FF" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#009000" />
diff --git a/data/themes/redandblack/colors.xml b/data/themes/redandblack/colors.xml
index 50384ce3a..8fe785114 100644
--- a/data/themes/redandblack/colors.xml
+++ b/data/themes/redandblack/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#c0c0c0" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#000000" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#1fa052" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 13d942d62..1f1ac1776 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#000000" />
 	<color id="SHADOW" color="#000000" />
 	<color id="OUTLINE" color="#000000" />
+	<color id="BORDER" color="#000000" />
 	<color id="PROGRESS_BAR" color="#ffffff" />
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#cccccc" />
@@ -11,11 +12,15 @@
 	<color id="GUILD_CHAT_TAB" color="#f48055" />
 	<color id="GUILD_SOCIAL_TAB" color="#f48055" />
 	<color id="BACKGROUND" color="#ffffff" />
+	<color id="BACKGROUND_GRAY" color="#404040" />
+	<color id="SCROLLBAR_GRAY" color="#000000" />
+	<color id="DROPDOWN_SHADOW" color="#c0c0c0" />
 	<color id="HIGHLIGHT" color="#ebc873" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
 	<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
 	<color id="SHOP_WARNING" color="#910000" />
 	<color id="ITEM_EQUIPPED" color="#000091" />
+	<color id="ITEM_NOT_EQUIPPED" color="#000000" />
 	<color id="CHAT" color="#000000" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#003000" />
diff --git a/makegprof b/makegprof
index 8cb63744c..b1ea32c7b 100755
--- a/makegprof
+++ b/makegprof
@@ -2,4 +2,5 @@
 
 mv run/gmon.out .
 gprof run/bin/manaplus >gprof.txt
-cat gprof.txt | gprof2dot.py | dot -Tpng -o gprof.png
+cat gprof.txt | gprof2dot.py >gprof.dot
+cat gprof.dot | dot -Tpng -o gprof.png
diff --git a/manaplus.cbp b/manaplus.cbp
index 2634e6e63..8ed18dbed 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -117,8 +117,8 @@
 		<Unit filename="src\channel.h" />
 		<Unit filename="src\channelmanager.cpp" />
 		<Unit filename="src\channelmanager.h" />
-		<Unit filename="src\chatlog.cpp" />
-		<Unit filename="src\chatlog.h" />
+		<Unit filename="src\chatlogger.cpp" />
+		<Unit filename="src\chatlogger.h" />
 		<Unit filename="src\client.cpp" />
 		<Unit filename="src\client.h" />
 		<Unit filename="src\commandhandler.cpp" />
@@ -196,8 +196,8 @@
 		<Unit filename="src\gui\logindialog.h" />
 		<Unit filename="src\gui\minimap.cpp" />
 		<Unit filename="src\gui\minimap.h" />
-		<Unit filename="src\gui\ministatus.cpp" />
-		<Unit filename="src\gui\ministatus.h" />
+		<Unit filename="src\gui\ministatuswindow.cpp" />
+		<Unit filename="src\gui\ministatuswindow.h" />
 		<Unit filename="src\gui\npcdialog.cpp" />
 		<Unit filename="src\gui\npcdialog.h" />
 		<Unit filename="src\gui\npcpostdialog.cpp" />
@@ -234,8 +234,12 @@
 		<Unit filename="src\gui\setup_keyboard.h" />
 		<Unit filename="src\gui\setup_other.cpp" />
 		<Unit filename="src\gui\setup_other.h" />
+		<Unit filename="src\gui\setup_perfomance.cpp" />
+		<Unit filename="src\gui\setup_perfomance.h" />
 		<Unit filename="src\gui\setup_players.cpp" />
 		<Unit filename="src\gui\setup_players.h" />
+		<Unit filename="src\gui\setup_relations.cpp" />
+		<Unit filename="src\gui\setup_relations.h" />
 		<Unit filename="src\gui\setup_theme.cpp" />
 		<Unit filename="src\gui\setup_theme.h" />
 		<Unit filename="src\gui\setup_video.cpp" />
@@ -272,8 +276,8 @@
 		<Unit filename="src\gui\sdlfont.h" />
 		<Unit filename="src\gui\unregisterdialog.cpp" />
 		<Unit filename="src\gui\unregisterdialog.h" />
-		<Unit filename="src\gui\updatewindow.cpp" />
-		<Unit filename="src\gui\updatewindow.h" />
+		<Unit filename="src\gui\updaterwindow.cpp" />
+		<Unit filename="src\gui\updaterwindow.h" />
 		<Unit filename="src\gui\userpalette.cpp" />
 		<Unit filename="src\gui\userpalette.h" />
 		<Unit filename="src\gui\viewport.cpp" />
@@ -345,6 +349,8 @@
 		<Unit filename="src\gui\widgets\resizegrip.h" />
 		<Unit filename="src\gui\widgets\scrollarea.cpp" />
 		<Unit filename="src\gui\widgets\scrollarea.h" />
+		<Unit filename="src\gui\widgets\setupitem.cpp" />
+		<Unit filename="src\gui\widgets\setupitem.h" />
 		<Unit filename="src\gui\widgets\setuptab.cpp" />
 		<Unit filename="src\gui\widgets\setuptab.h" />
 		<Unit filename="src\gui\widgets\shopitems.cpp" />
@@ -361,8 +367,8 @@
 		<Unit filename="src\gui\widgets\tab.h" />
 		<Unit filename="src\gui\widgets\tabbedarea.cpp" />
 		<Unit filename="src\gui\widgets\tabbedarea.h" />
-		<Unit filename="src\gui\widgets\table.cpp" />
-		<Unit filename="src\gui\widgets\table.h" />
+		<Unit filename="src\gui\widgets\guitable.cpp" />
+		<Unit filename="src\gui\widgets\guitable.h" />
 		<Unit filename="src\gui\widgets\tablemodel.cpp" />
 		<Unit filename="src\gui\widgets\tablemodel.h" />
 		<Unit filename="src\gui\widgets\textbox.cpp" />
@@ -406,8 +412,8 @@
 		<Unit filename="src\listener.h" />
 		<Unit filename="src\localplayer.cpp" />
 		<Unit filename="src\localplayer.h" />
-		<Unit filename="src\log.cpp" />
-		<Unit filename="src\log.h" />
+		<Unit filename="src\logger.cpp" />
+		<Unit filename="src\logger.h" />
 		<Unit filename="src\main.cpp" />
 		<Unit filename="src\main.h" />
 		<Unit filename="src\manaplus.rc">
diff --git a/packwin b/packwin
index 8980b0e50..7d630dc98 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.1.8.7" \
+    -DPRODUCT_VERSION="1.1.8.21" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/po/LINGUAS b/po/LINGUAS
index a85877412..66da28559 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -17,7 +17,7 @@ hr
 hu
 id
 #it # Not enough translations
-#ja # Disabled because of current client limitations (font fallbacking)
+ja
 #ka # Not enough translations
 #nb # Not enough translations
 #nds # Not enough translations
@@ -34,6 +34,6 @@ ru
 #th # Disabled because of current client limitations (font fallbacking)
 #tr # Not enough translations
 #uk # Not enough translations
-#zh_CN # Disabled because of current client limitations (font fallbacking)
+zh_CN
 #zh_HK # Disabled because of current client limitations (font fallbacking)
 #zh_TW # Disabled because of current client limitations (font fallbacking)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01fa8e017..311ca756d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ src/gui/itempopup.cpp
 src/gui/killstats.cpp
 src/gui/logindialog.cpp
 src/gui/minimap.cpp
-src/gui/ministatus.cpp
+src/gui/ministatuswindow.cpp
 src/gui/npcdialog.cpp
 src/gui/npcpostdialog.cpp
 src/gui/okdialog.cpp
@@ -42,11 +42,12 @@ src/gui/setup_audio.cpp
 src/gui/setup_chat.cpp
 src/gui/setup_colors.cpp
 src/gui/setup.cpp
-src/gui/setupitem.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
 src/gui/setup_other.cpp
+src/gui/setup_perfomance.cpp
 src/gui/setup_players.cpp
+src/gui/setup_relations.cpp
 src/gui/setup_theme.cpp
 src/gui/setup_video.cpp
 src/gui/shopwindow.cpp
@@ -59,12 +60,13 @@ src/gui/textcommandeditor.cpp
 src/gui/textdialog.cpp
 src/gui/tradewindow.cpp
 src/gui/unregisterdialog.cpp
-src/gui/updatewindow.cpp
+src/gui/updaterwindow.cpp
 src/gui/userpalette.cpp
 src/gui/whoisonline.cpp
 src/gui/widgets/battletab.cpp
 src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
+src/gui/widgets/setupitem.cpp
 src/gui/widgets/tradetab.cpp
 src/gui/widgets/whispertab.cpp
 src/gui/windowmenu.cpp
@@ -72,9 +74,21 @@ src/gui/worldselectdialog.cpp
 src/inventory.cpp
 src/keyboardconfig.cpp
 src/localplayer.cpp
-src/log.h
+src/logger.h
 src/main.cpp
 src/net/ea/buysellhandler.cpp
+src/net/ea/charserverhandler.cpp
+src/net/ea/chathandler.cpp
+src/net/ea/gamehandler.cpp
+src/net/ea/gui/guildtab.cpp
+src/net/ea/guildhandler.cpp
+src/net/ea/gui/partytab.cpp
+src/net/ea/inventoryhandler.cpp
+src/net/ea/loginhandler.cpp
+src/net/ea/partyhandler.cpp
+src/net/ea/playerhandler.cpp
+src/net/ea/specialhandler.cpp
+src/net/ea/tradehandler.cpp
 src/net/manaserv/attributes.cpp
 src/net/manaserv/beinghandler.cpp
 src/net/manaserv/charhandler.cpp
@@ -86,20 +100,9 @@ src/net/manaserv/playerhandler.cpp
 src/net/manaserv/tradehandler.cpp
 src/net/tmwa/adminhandler.cpp
 src/net/tmwa/buysellhandler.cpp
-src/net/tmwa/charserverhandler.cpp
-src/net/tmwa/chathandler.cpp
-src/net/tmwa/gamehandler.cpp
 src/net/tmwa/generalhandler.cpp
-src/net/tmwa/gui/guildtab.cpp
-src/net/tmwa/guildhandler.cpp
-src/net/tmwa/gui/partytab.cpp
-src/net/tmwa/inventoryhandler.cpp
-src/net/tmwa/loginhandler.cpp
 src/net/tmwa/network.cpp
 src/net/tmwa/partyhandler.cpp
-src/net/tmwa/playerhandler.cpp
-src/net/tmwa/specialhandler.cpp
-src/net/tmwa/tradehandler.cpp
 src/playerrelations.cpp
 src/resources/beinginfo.cpp
 src/resources/itemdb.cpp
diff --git a/po/ar.po b/po/ar.po
index 5e4a85dce..a253f69ff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,2980 +1,4685 @@
-# Arabic translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-06-08 22:01+0000\n"
-"Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
-"Language-Team: Arabic <ar@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:47+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "جارِ الاتّصال..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "ولوج"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "إنتقاء الشخصيّة"
+msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "كلمة السرّ:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "تغيير"
+msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "إلغاء التسجيل"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr ""
-
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr ""
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr ""
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr ""
-
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr ""
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr ""
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/game.cpp:1577
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/beingpopup.cpp:118
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:132
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-
-#: src/game.cpp:172
-msgid "General"
+msgid "Guild: %s"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "بيع"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "الاسم:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "لون الشعر:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "قصّة الشعر:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "تغيير"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "نعم"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "لا"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Music: %s"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "الاسم: %s"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "خارطة صغيرة"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Particle count: %d"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Particle detail: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "مؤثّرات محيطة"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "إسقاط"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr ""
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "التأثير: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, 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[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "الخادوم:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "تغيير"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "التّالي"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "تجريد من العتاد"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@تجارة|متاجرة مع %s@@"
-
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "مهاجمة %+d"
-
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "تبديل الخادوم"
-
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "تبديل الشخصيّة"
-
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr ""
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr "تبديل الخادوم"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr ""
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr "تبديل الشخصيّة"
 
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "البريد الإلكترونيّ:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "الخادوم:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "المنفذ:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "الخادوم:"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "جارِ الاتّصال..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "مؤشّر مخصّص"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "صوت"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "معايرة"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "إيقاف"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_video.cpp:194
+msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "حدّ FPS:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
-msgstr ""
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "لا"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "جارِ ملء الشاشة"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "تغيير OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "إضافة"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "مهارات"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "المستوى: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "المستوى: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "إنشاء شخصيّة"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "النقود: %d"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "إحصائيات الشخصيّة جيّدة"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "المستوى: %d"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "إضافة"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "أنت تقدّم:"
+msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "اختصار"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "تغيير"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "الاسم:"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "دفاع %+d"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "مهاجمة %+d"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "دفاع %+d"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "إلغاء التسجيل"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2982,650 +4687,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "أنت تقدّم:"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "إحصائيات الشخصيّة جيّدة"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "إحصائيات الشخصيّة جيّدة"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "قوّة الذات:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "قوّة الذات:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "مهاجمة %+d"
+msgid "Strength %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "دفاع %+d"
+msgid "Agility %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "Vitality %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+msgid "Intelligence %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
 msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "الوصف: %s"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "السّابق"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "جديد"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "موافق"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@مهاجمة|هاجم %s@@"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@إلغاء|إلغاء@@"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@استخدام|استخدام العتاد@@"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@استخدم|استخدم@@"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@إسقاط|إسقاط@@"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@قسم|قسم@@"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@اقتطاف|اقتطاف %s@@"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
+
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "مهاجمة %+d"
+
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "دفاع %+d"
+
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
+
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
+
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr ""
 
-#~ msgid "Scroll radius"
-#~ msgstr "نصف قطر اللفّ"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "كسل اللفّ"
diff --git a/po/bg.po b/po/bg.po
index 25037b2d4..331135697 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,2949 +1,4653 @@
-# Bulgarian translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-10-21 13:06+0000\n"
-"Last-Translator: Mila <Unknown>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Непозната команда."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Помощ --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
 msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-msgid "% Evade"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-msgid "% Critical"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Непозната команда."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2951,607 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Непозната команда."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Непозната команда."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+
diff --git a/po/ca.po b/po/ca.po
index 1722d9db7..3ce627303 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,2956 +1,4653 @@
-# Catalan translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-06-08 22:01+0000\n"
-"Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
-"Language-Team: Catalan <ca@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "canvi"
+msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
+msgstr "sortir"
+
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
+msgstr "nom"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "sortir"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr ""
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
+msgstr "si"
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr ""
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
+msgstr "no"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "nom"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
-msgid "Change Email"
-msgstr "canvi"
-
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "si"
-
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "no"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "canvi"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_video.cpp:194
+msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "no"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "canvi"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "nom"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2958,609 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "ok"
diff --git a/po/cs.po b/po/cs.po
index 06a9fb632..afda4a26c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,2653 +1,4339 @@
-# Czech translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-12-04 15:16+0000\n"
-"Last-Translator: David Kolibáč <david@kolibac.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Čeká se na server"
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Přihlášení"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Vyber postavu"
+msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Heslo:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Změnit"
+msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Zrušit registraci"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Nápověda --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > Zobrazit tuto nápovědu"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > Zobrazit jméno mapy"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > Zobrazit počet uživatelů on-line"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > Říct něco o sobě"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > Vyčistit toto okno"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Odeslat soukromou zprávu uživateli"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Jiné označení pro msg"
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > Jiné označení pro msg"
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Založit kartu pro soukromé zprávy jinému uživateli"
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > Jiné označení pro query"
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > Zobrazit seznam všech veřejných kanálů"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > Připojit se, nebo vytvořit kanál"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/party >Pozvat uživatele do party"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party >Pozvat uživatele do party"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Spustit nahrávání záznamu chatu do externího souboru"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globální oznámení (jen GM)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "Pro bližší informace zadejte /help <command>."
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Příkaz: /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Tento příkaz zobrazí seznam všech příkazů, které jsou k dispozici."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "Příkaz: /help <command>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "Tento příkaz zobrazí nápovědu k <command>."
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Příkaz: /announce <msg>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** K dispozici pouze pro GM ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Tento příkaz odešle zprávu <msg> všem hráčům, kteří jsou on-line."
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Příkaz: /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "Tento příkaz vyčistí záznam předchozího chatu."
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Příkaz: /join <channel>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "Příkaz: /join <channel>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "Tento příkaz vás připojí ke kanálu <channel>."
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Pokud <channel> neexistuje, bude vytvořen."
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "Příkaz: /list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "Tento příkaz zobrazí seznam všech kanálů."
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "Příkaz: /me <message>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "Příkaz: /msg <nick> <message>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "Příkaz: /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "Příkaz: /w <nick> <message>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "Příkaz: /query <nick>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "Příkaz: /q <nick>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Příkaz: /party <nick>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Tento příkaz vás připojí ke kanálu <channel>."
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "Příkaz: /party <nick>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "Příkaz: /present"
-
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "Příkaz: /record <filename>"
-
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "Příkaz: /record"
-
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "Příkaz: /toggle <state>"
-
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "Příkaz: /toggle"
-
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Příkaz: /announce <msg>"
-
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "Tento příkaz zobrazí název aktuální mapy."
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
-
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:397
-#, c-format
-msgid "Requesting to join channel %s."
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Snímek obrazovky uložen do ~/"
+msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "Připojení k serveru bylo ztraceno, program nyní bude ukončen"
+msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Nelze nahrát mapu"
+msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Parta (%s)"
+msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "Jméno"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "Útok"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "Reset"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "Vše"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Prodej"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "Změnit e-mail"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "Zadejte dvakrát nový e-mail:"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Uživatelské jméno musí být kratší než %d znaků."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "Zadejte dvakrát nové heslo:"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Heslo musí být dlouhé nejméně %d znaků."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Heslo musí být kratší než %d znaků."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "Barva vlasů:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "Účes:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů."
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potvrďte smazání postavy"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "Správa účtu a postavy"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "Změnit e-mail"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "Barvy"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d hráči jsou přítomni."
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "Ano"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "Mapa"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
 #, c-format
-msgid "%d FPS"
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Jméno: %s"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Peníze: %s"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Účet: %s"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Particle detail: %s"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Ambient FX: %s"
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "OK"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr "Sloty:"
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Upustit"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "Sloty:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "OK"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "Vše"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "Hmotnost: "
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, 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] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Přihlášení"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "Zapamatovat uživatelské jméno"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mapa"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "Čeká se na server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Reset"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Další"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Odstranit z vybavení"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Text"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "Obchod"
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Pozadí"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Zvýraznit"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Předmět je příliš drahý"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Předmět je ve vybavení"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Hráč"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Šeptat"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
+msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Je"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Parta"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilda"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Jména ostatních hráčů"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Jména GM"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstra"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Klobouky"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Jednoruční zbraně"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Kalhoty"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Boty"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Jednoruční zbraně"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Štíty"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Prsteny"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Náhrdelníky"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munice"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritický zásah"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Útok %+d"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Šeptat"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "%s vás zve ke vstupu do své party."
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "Monstra"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Přepněte postavu"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
+msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr "Přepněte postavu"
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "Potvrdit:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "E-mail:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Heslo musí být dlouhé nejméně %d znaků."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "Vyberte si server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "Připojuji se..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "Vlastní kurzor"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Prosím zadejte adresu a port serveru."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "Čeká se na server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Zvuk"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "Hlasitost efektů"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "Hlasitost hudby"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "Bez textu"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Barvy"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "Barvy"
+msgid "This is what the color looks like"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "Typ: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Duha"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "Hrát"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "Červená: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "Zelená: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Použít"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Stiskněte tlačítko pro zahájení kalibrace"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "Zapnout joystick"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstra"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Hráči"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "Jméno"
+msgid "Show level"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutrální"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "Hráči"
-
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "Malý"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "Střední"
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "Velký"
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Velikost písma"
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Bez textu"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "vypnout"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "nízký"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "vysoký"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "střední"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
-msgstr ""
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "Velikost písma"
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Ne"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Přepnout na celou obrazovku"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Přepnout OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Změny se projeví až po změně mapy."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "Přidat"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "Dovednosti"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Úroveň: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Úroveň: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "Vytvořit guildu"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Opravdu chcete skončit?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party >Pozvat uživatele do party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "/party >Pozvat uživatele do party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Opravdu chcete skončit?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Vytvořit guildu"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "Vytvořit postavu"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "Pozvat uživatele"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "Velký"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Přijmout pozvání od %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Odmítnout pozvání od %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Přijmout pozvání od %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Odmítnout pozvání od %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "Guilda"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "Vyberte si server"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s vás zve ke vstupu do party: %s"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "Přijmout pozvání do party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s vás zve ke vstupu do své party."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s vás zve ke vstupu do party: %s"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "Parta"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "Vyberte si server"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Peníze: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Úroveň: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "Obchod"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "Přidat"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "Jména ostatních hráčů"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "Jména GM"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "Kritický zásah"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Pokud jste poslední osobou v kanálu, kanál bude smazán."
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "Nelze poslat prázdný chat!"
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "Příkaz: /record"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "Zkratka"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "Vyberte server"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "Změnit"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "Vyberte si server"
+msgstr ""
+
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "Útok"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smajlíky"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr "Smajlíky"
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Monstra"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+
+#: src/localplayer.cpp:3174
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:3478
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:50
+msgid "              to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:44
+#: src/main.cpp:52
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:45
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
+#: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr "/help > Zobrazit tuto nápovědu"
+msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:62
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
 msgstr "Děkuji za nákup."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Děkuji za prodej."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Přístup zamítnut"
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
-msgid "Strength:"
-msgstr "Síla:"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
-msgid "Agility:"
-msgstr "Hbitost:"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
-msgid "Vitality:"
-msgstr "Vitalita:"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
-msgid "Intelligence:"
-msgstr "Inteligence:"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
-msgid "Dexterity:"
-msgstr "Obratnost:"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
-msgid "Luck:"
-msgstr "Štěstí:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/chathandler.cpp:128
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Hráč"
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
 #: src/net/ea/gamehandler.cpp:86
@@ -2655,373 +4341,321 @@ msgstr ""
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Jméno"
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
-#, c-format
-msgid "Luck %+d"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "Síla"
-
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "Hbitost"
-
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "Vitalita"
-
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "Inteligence"
-
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "Obratnost"
-
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "Štěstí"
-
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Obrana:"
-
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Útok:"
-
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Obrana:"
-
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Přesnost:"
-
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% Únik:"
-
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritický zásah"
-
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/party >Pozvat uživatele do party"
-
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
-
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Neznámý předmět"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Zrušit registraci"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Špatné heslo"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Odmítnout pozvání od %s."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3029,692 +4663,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Síla"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Hbitost"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Obratnost"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalita"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligence"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Neznámý příkaz."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "Příkaz: /join <channel>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Neznámý příkaz."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Šeptat"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "Zadejte dvakrát nové heslo:"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "Zadejte dvakrát nový e-mail:"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "Chybné uživatelské jméno nebo heslo"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "Chybné uživatelské jméno, heslo nebo e-mail"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "Odmítnout pozvání od %s."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Děkuji za prodej."
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "Útok %+d"
+msgid "Strength %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "Obrana %+d"
+msgid "Agility %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
+msgid "Intelligence %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Neznámý předmět"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
 msgstr ""
 
-#~ msgid "no"
-#~ msgstr "ne"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Kamarád"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Buddy List"
-#~ msgstr "Seznam kamarádů"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Popis: %s"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Štěstí"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Účinek: %s"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Předchozí"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Nová"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Úroveň povolání: %d"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Obouruční zbraně"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "fullscreen"
-#~ msgstr "celá obrazovka"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Weapons"
-#~ msgstr "Zbraně"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Crafts"
-#~ msgstr "Řemesla"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Cena"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Attack:"
-#~ msgstr "Útok:"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reakce:"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Guilds"
-#~ msgstr "Gildy"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
 
-#~ msgid "Unarmed"
-#~ msgstr "Neozbrojený"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "Nůž"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Meč"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Hůl"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Bič"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Luk"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Útok %+d"
 
-#~ msgid "Mace"
-#~ msgstr "Palcát"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Obrana %+d"
+
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Neznámý předmět"
 
-#~ msgid "Axe"
-#~ msgstr "Sekera"
 
-#~ msgid "mana"
-#~ msgstr "mana"
diff --git a/po/da.po b/po/da.po
index d3247ea64..295aa8ab6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,127 +1,127 @@
-# Danish translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# GonzoDark <Gonzo.Dark@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2009-07-25 17:33+0000\n"
-"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
-"Language-Team: Danish <none@none.none>\n"
-"Language: da\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1030
-#, fuzzy
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr "Synlige navne"
+msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:900
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Opretter forbindelse til kort-serveren..."
+msgstr "Forbinder til server"
 
-#: src/client.cpp:931
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Log Ind"
+msgstr "Logger ind"
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1056
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Vælg Karakter"
+msgstr ""
 
-#: src/client.cpp:1087
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "Opretter forbindelse til kort-serveren..."
+msgstr ""
 
-#: src/client.cpp:1097
-#, fuzzy
+#: src/client.cpp:1113
 msgid "Changing game servers"
-msgstr "Server"
+msgstr ""
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1177
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Adgangskode:"
+msgstr ""
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1197
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Ændre"
+msgstr ""
 
-#: src/client.cpp:1198
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1218
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Frameld"
+msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1612
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Ugyldig opdaterings host: "
+msgstr ""
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -137,8 +137,8 @@ msgstr "du kan ikke sende en hviskebesked uden tekst!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
 #: src/commandhandler.cpp:429
@@ -146,14 +146,13 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
 #: src/commandhandler.cpp:456
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Du glemte at skrive et navn på dit party."
+msgstr ""
 
 #: src/commandhandler.cpp:469 src/commandhandler.cpp:576
 #: src/commandhandler.cpp:617 src/commandhandler.cpp:647
@@ -177,34 +176,31 @@ msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
 #: src/commandhandler.cpp:555
-#, fuzzy
 msgid "friend"
-msgstr "Ven"
+msgstr ""
 
 #: src/commandhandler.cpp:560
-#, fuzzy
 msgid "disregarded"
-msgstr "Se bort fra"
+msgstr ""
 
 #: src/commandhandler.cpp:565
-#, fuzzy
 msgid "neutral"
-msgstr "Neutral"
+msgstr ""
 
 #: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
 #: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Du har nu oprettet gruppen."
+msgstr ""
 
 #: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
 #: src/commandhandler.cpp:628
 msgid "Player wasn't ignored!"
@@ -215,24 +211,20 @@ msgid "Player no longer ignored!"
 msgstr ""
 
 #: src/commandhandler.cpp:637
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
 #: src/commandhandler.cpp:654
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
 #: src/commandhandler.cpp:665
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Du har nu oprettet gruppen."
+msgstr ""
 
 #: src/commandhandler.cpp:667
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
 #: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
@@ -275,24 +267,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "font cache size"
-msgstr "Skriftstørrelse"
+msgstr ""
 
 #: src/commandhandler.cpp:1094
-#, fuzzy
 msgid "Cache size:"
-msgstr "Skriftstørrelse"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Opret"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Slet"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -307,108 +295,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
-#, fuzzy
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Skærmbillede gemt under ~/"
+msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:511
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
+msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/game.cpp:1425
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Kunne ikke loade kortet"
+msgstr ""
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
 
-#: src/gui/beingpopup.cpp:108
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Gruppe (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:122
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:132
+#, c-format
 msgid "Guild: %s"
-msgstr "Guilds"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:146
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:156
+#, c-format
 msgid "Comment: %s"
-msgstr "Kommando: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Chat-vindue"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Angrib"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Snak"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
-msgstr "Flyt op"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Nulstil"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Køb"
 
@@ -437,7 +419,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Afslut"
 
@@ -448,31 +430,31 @@ msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "butik"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sælg"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -488,24 +470,22 @@ msgid "Account: %s"
 msgstr "Konto: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Skriv den nye email-adresse to gange"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Brugernavnet skal mindst være %d bogstaver langt."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Den nye  email-adresse eksisterer allerede."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -518,23 +498,22 @@ msgid "Password:"
 msgstr "Adgangskode:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Skriv den nye email-adresse to gange"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Adgangskoden skal mindst være %d bogstaver langt."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -564,14 +543,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Hårfarve:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Frisure:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -630,82 +607,71 @@ msgid "Unregister"
 msgstr "Frameld"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Skift e-mail adresse"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Forkert brugernavn eller password"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Kunne ikke slette karakteren."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Forkert brugernavn eller password"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Slet"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Luk"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Niveau: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Standard"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Ven"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Grøn: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Blå: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "lav"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hyperlink"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -716,30 +682,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Kastevåben"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Regnbuefarvet"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Regnbuefarvet"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Regnbuefarvet"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -747,12 +709,12 @@ msgstr "???"
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:589
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "Der er %d spillere til stede"
+msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -766,61 +728,53 @@ msgid "No"
 msgstr "Nej"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
-#, fuzzy
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
-msgstr "Ignorer"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Kort"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Flyt til venstre"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Næste"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Lydstyrke på musik"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Navn: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "MiniKort"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Brugerdefineret cursor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Spiller rammer monster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Partikeleffekter"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -852,51 +806,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Partikeleffekter"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Flyt til venstre"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Vælg spiller som ny modstander"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Vælg spiller som ny modstander"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Vælg spiller som ny modstander"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Vælg spiller som ny modstander"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Angreb %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "MiniKort"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -905,9 +852,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Kritisk sår"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -929,28 +875,25 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Luk"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Forrige"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Næste"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
@@ -958,10 +901,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -969,84 +912,80 @@ msgstr "Tag af"
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-#, fuzzy
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:121
-#, fuzzy
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
-msgstr "en/et"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-#, fuzzy
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
-msgstr "en/et"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Smid"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Smid"
@@ -1084,107 +1023,103 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Ukendt fejl"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Vægt: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Statsvindue"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Nulstil"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Nulstil"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Niveau: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Pris: %s / Total: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1193,9 +1128,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Luk"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1215,9 +1149,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Husk Brugernavn"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1228,18 +1161,16 @@ msgid "Register"
 msgstr "Registrer"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
 #: src/gui/ministatus.cpp:59
 msgid "health bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:65
-#, fuzzy
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
 #: src/gui/ministatus.cpp:77
 msgid "experience bar"
@@ -1250,27 +1181,24 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:92
-#, fuzzy
 msgid "weight bar"
-msgstr "Vægt: "
+msgstr ""
 
 #: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:98
-#, fuzzy
 msgid "money bar"
-msgstr "Monster rammer spiller"
+msgstr ""
 
 #: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:104
-#, fuzzy
 msgid "status bar"
-msgstr "Status"
+msgstr ""
 
 #: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
@@ -1289,18 +1217,17 @@ msgid "Submit"
 msgstr "Send forespørgsel"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
-msgstr "Hellebard"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Næste"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1320,364 +1247,329 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Penge: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Tag af"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handl"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
-msgstr "Hvisk"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
-#, fuzzy
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
-msgstr "Ven"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
-#, fuzzy
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
-msgstr "Se bort fra"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
-#, fuzzy
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
-msgstr "Ignorer"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore||Ignorer %s fuldstændigt@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
-#, fuzzy
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
-msgstr "lav"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
-#, fuzzy
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
-msgstr "Skift e-mail adresse"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
-msgstr "/party > Inviter en spiller til din gruppe"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
-#, fuzzy
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
-msgstr "@@admin-kick|Spark spiller ud@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
-#, fuzzy
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
-msgstr "@@admin-kick|Spark spiller ud@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
-#, fuzzy
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
-msgstr "Ændre"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
-#, fuzzy
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
-msgstr "/party > Inviter en spiller til din gruppe"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
-#, fuzzy
 msgid "Kick player"
-msgstr "Du kunne ikke sparke denne bruger af kanalen"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
-msgstr "Vis navn"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
-#, fuzzy
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
-msgstr "@@attack|Angrib %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:296
-#, fuzzy
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
-msgstr "@@attack|Angrib %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:299
-#, fuzzy
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
-#, fuzzy
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
-msgstr "@@chat|Tilføj til chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:461
-#, fuzzy
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
-msgstr "Saml op"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
-#, fuzzy
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
-msgstr "@@chat|Tilføj til chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
-msgstr "Husk Brugernavn"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
-#, fuzzy
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
-msgstr "Husk Brugernavn"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
-#, fuzzy
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
-msgstr "Fremhæv tab"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:545
-#, fuzzy
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
-msgstr "Fremhæv tab"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
-msgstr "Husk Brugernavn"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
-msgstr "Du kan ikke købe."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
-msgstr "Slå handler fra/til"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Stor"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:715
-#, fuzzy
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
-msgstr "Ændre"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
-#, fuzzy
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
-msgstr "@@chat|Tilføj til chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
-#, fuzzy
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
-msgstr "@@chat|Tilføj til chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
-#, fuzzy
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
-#, fuzzy
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
-#, fuzzy
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1567
-#, fuzzy
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1569
-#, fuzzy
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
-msgstr "Gem på lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
-msgstr "Smid"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
-msgstr "Hent fra lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1611
-#, fuzzy
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
-msgstr "Hent fra lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
-#, fuzzy
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
-msgstr "Hent fra lager"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
-#, fuzzy
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
-msgstr "@@chat|Tilføj til chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Standard"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
-#, fuzzy
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
-msgstr "Flyt op"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
-#, fuzzy
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
-msgstr "Flyt ned"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
@@ -1724,14 +1616,12 @@ msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
 #: src/gui/serverdialog.cpp:228
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Vælg din server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Vælg din server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1742,23 +1632,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:287
-#, fuzzy
 msgid "Connect"
-msgstr "Opretter forbindelse..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:288
-#, fuzzy
 msgid "Custom Server"
-msgstr "Brugerdefineret cursor"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
@@ -1770,9 +1657,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:556
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Venter på serveren"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
@@ -1804,14 +1690,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Aktiver joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Aktiver joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1830,9 +1714,8 @@ msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Ingen tekst"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1842,67 +1725,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Farver"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-#, fuzzy
-msgid "Enable trade tab"
-msgstr "Du kan ikke købe."
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Placer alle hviskesamtaler i en tab"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Du kan ikke købe."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:91
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Vis navn"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:94
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Gå til næste chat tab"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1910,14 +1821,9 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Farver"
-
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Type: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1939,39 +1845,34 @@ msgid "Spectrum"
 msgstr "Spektrum"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Forsinkelse: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Rød: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Grøn: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Blå: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -2008,9 +1909,8 @@ msgid "Assign"
 msgstr "Tildel"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Tildel"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2024,487 +1924,515 @@ msgstr "Tast Konfikt(er) Opdaget."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstre"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Du kan ikke købe."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Fremhæv"
+msgid "Show monster hp bar"
+msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-#, fuzzy
-msgid "Highlight floor items"
-msgstr "Fremhæv"
-
 #: src/gui/setup_other.cpp:67
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Aktiver joystick"
+msgid "Show warps particles"
+msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-#, fuzzy
-msgid "Show warps particles"
-msgstr "som partikeleffekt"
+msgid "Highlight floor items"
+msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Vis navn"
+msgid "Moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
-#, fuzzy
-msgid "Show own hp bar"
-msgstr "Vis navn"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Aktiver joystick"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-#, fuzzy
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
-msgstr "Besked"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
 
-#: src/gui/setup_other.cpp:114
-#, fuzzy
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr "Du kan ikke købe."
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
 
-#: src/gui/setup_other.cpp:117
-#, fuzzy
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr "Slå handler fra/til"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
-#, fuzzy
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
-msgstr "Du kan ikke købe."
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Brugere"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Synlige navne"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Ven"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Placer alle hviskesamtaler i en tab"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Vis navn"
-
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Brugere"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
-#: src/gui/setup_players.cpp:313
-#, fuzzy
-msgid "Show level"
-msgstr "Vis navn"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:317
-#, fuzzy
-msgid "Show own name"
-msgstr "Vis navn"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:321
-#, fuzzy
-msgid "Target dead players"
-msgstr "Vælg spiller som ny modstander"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:325
-#, fuzzy
-msgid "Secure trades"
-msgstr "Accepter handel"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-#, fuzzy
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
-msgstr "Partikeleffekter"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-#, fuzzy
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr "Hjælp"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
-msgstr "Accepter handel"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Skriftstørrelse"
 
-#: src/gui/setup_theme.cpp:241
-#, fuzzy
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr "Ændre"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Meget lille"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Lille"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Middel"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Stor"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-#, fuzzy
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:224
-#, fuzzy
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Ingen tekst"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bobler uden navne"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bobler med navne"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "deaktiveret"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "mellem"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:328
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Relation"
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Synlige navne"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Vis besked når noget samles op"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "i chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "som partikeleffekt"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Aktiver joystick"
-
-#: src/gui/setup_video.cpp:353
-#, fuzzy
-msgid "Show background"
-msgstr "Baggrund"
-
-#: src/gui/setup_video.cpp:358
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS-grænse:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
-#, fuzzy
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr "FPS-grænse:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:380
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Partikeldetaljer"
-
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Skriftstørrelse"
+msgstr ""
 
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nej"
+msgstr ""
 
-#: src/gui/setup_video.cpp:583
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:589
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:600
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Skifter til fuld skærm"
+msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:613
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Skrifter til OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Skærmopløsning ændret"
+msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Ændrede Partikeleffekter."
+msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
@@ -2521,7 +2449,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Tilføj"
 
@@ -2533,15 +2461,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Anmodning om byttehandel."
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s vil gerne handle med dig. Accepterer du?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2552,31 +2480,31 @@ msgid "Up"
 msgstr "Op"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Færdigheds-points: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Færdigheds-points: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Færdigheder"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Niveau: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Niveau: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Opret en guild"
 
@@ -2586,9 +2514,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Oprettede en ny guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2600,23 +2528,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Opret en guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "ER du sikker på at du vil afslutte programmet?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Gruppe"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Inviter en spiller til din gruppe"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2624,9 +2551,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Inviter en spiller til din gruppe"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2638,75 +2564,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "ER du sikker på at du vil afslutte programmet?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Angrib"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Angrib"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignorer"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Opret en guild"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Lav en ny karakter."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Inviter en spiller"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Du har accepteret en invitation fra %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Du har ignoreret en invitation fra %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Du har accepteret en invitation fra %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Du har ignoreret en invitation fra %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2714,42 +2635,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Opret en guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Vælg din server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s har inviteret med i %s's gruppe."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Accepter invitationen"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s har inviteret med i sin gruppe"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s har inviteret med i %s's gruppe."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2770,263 +2687,254 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Gruppe"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Vælg din server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Flyt til venstre"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Flyt til venstre"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Angrib"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Skift karakter"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Skift karakter"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Skift karakter"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Tastatur"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3066,19 +2974,19 @@ msgid "Job:"
 msgstr "Job:"
 
 #: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Du har brugt alle dine points"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Niveau: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Færdigheds-points: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
 #: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
@@ -3207,99 +3115,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Flyt til venstre"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Tillad handel"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Flyt til venstre"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Alment formål"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Kommando: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Kommando: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Vælg spiller som ny modstander"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Maks. level"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Vis navn"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3323,26 +3219,27 @@ msgstr "Godkendt. Venter..."
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "Du får %s."
+msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
 "vinduet."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
@@ -3363,22 +3260,21 @@ msgstr "Opretter forbindelse..."
 msgid "Play"
 msgstr "Spil"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1  du prøver igen senere"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Udført"
 
@@ -3387,24 +3283,20 @@ msgid "Being"
 msgstr "Skabning"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Ven"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Se bort fra"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignorer"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM-navne"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3422,28 +3314,21 @@ msgstr "GM-navne"
 msgid "NPCs"
 msgstr "NPC'er"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monstre"
-
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Monster rammer spiller"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Gruppe"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Opret en guild"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3458,76 +3343,64 @@ msgid "Exp Notification"
 msgstr "XP-notits"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Monster rammer spiller"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Spiller rammer monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Monster rammer spiller"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Andre spilleres navne"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Kritisk sår"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Spiller rammer monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Spiller rammer monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
-#, fuzzy
 msgid "Local Player Miss"
-msgstr "Gem bruger liste"
+msgstr ""
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
 msgstr "Rammer forbi"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Fremhæv tab"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Fremhæv"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Fremhæv"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Fremhæv"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Fremhæv tab"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3538,9 +3411,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Monster rammer spiller"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3554,23 +3426,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3635,7 +3507,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Denne kommando gør <navn> til operator"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
@@ -3674,9 +3546,9 @@ msgid "Global announcement from %s:"
 msgstr "Besked fra %s til alle:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s hvisker: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3699,36 +3571,29 @@ msgid "This command closes the current whisper tab."
 msgstr "Denne kommando lukker den aktuelle hviskesamtale-tab"
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Kommando: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Kommand: /item <regel>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
-"Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
-"<filnavn>"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Chat-vindue"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3743,9 +3608,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Smiley"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3780,9 +3644,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Genvej"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3805,23 +3668,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Vælg OK"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Ændre"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Vælg din server"
+msgstr ""
 
 #: src/inventory.cpp:248
 msgid "Storage"
-msgstr "Opbevaret"
+msgstr ""
 
 #: src/inventory.cpp:250
 msgid "Cart"
@@ -3848,9 +3708,8 @@ msgid "Target & Attack"
 msgstr "Vælg modstander og angrib"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Flyt til venstre"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3877,9 +3736,8 @@ msgid "Stop Attack"
 msgstr "Stop angreb"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Vælg nærmeste monster som ny modstander"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3914,14 +3772,12 @@ msgid "Enable/Disable Trading"
 msgstr "Slå handler fra/til"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Skift e-mail adresse"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Shortcut %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -3933,7 +3789,7 @@ msgstr "Shortcut %d"
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Shortcut %d"
@@ -3979,43 +3835,36 @@ msgid "Debug Window"
 msgstr "Debug-vindue"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Færdigheds-vindue"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Statsvindue"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Opsætnings-vindue"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Gem vinduer"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Statsvindue"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Kommando: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Chat-vindue"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4026,14 +3875,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Gå til sidste chat tab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Gå til næste chat tab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4057,7 +3904,7 @@ msgstr "Gå til næste chat tab"
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
@@ -4094,218 +3941,205 @@ msgstr "Gå til sidste chat tab"
 msgid "Next Chat Tab"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr "Gå til sidste chat tab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:279
-#, fuzzy
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr "Gå til næste chat tab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "Vælg OK"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
-#, fuzzy
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr "Flyt ned"
+msgstr ""
 
-#: src/keyboardconfig.cpp:295
-#, fuzzy
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr "Flyt til venstre"
+msgstr ""
 
-#: src/keyboardconfig.cpp:296
-#, fuzzy
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr "Flyt til højre"
+msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
-#, fuzzy
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr "Skift karakter"
+msgstr ""
 
-#: src/keyboardconfig.cpp:316
-#, fuzzy
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
-#, fuzzy
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr "Vælg modstander og angrib"
+msgstr ""
 
-#: src/keyboardconfig.cpp:322
-#, fuzzy
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr "Skift adgangskode"
+msgstr ""
 
-#: src/keyboardconfig.cpp:324
-#, fuzzy
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr "Skift e-mail adresse"
+msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
-#, fuzzy
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr "Slå handler fra/til"
+msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
+msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
-#, fuzzy
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
-msgstr "Du kunne ikke bruge denne genstand."
+msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
-#, fuzzy
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
-msgstr "Serveren er fuld"
+msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
-#, fuzzy, c-format
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du samlede %s [@@%d|%s@@] op."
-msgstr[1] "Du samlede %s [@@%d|%s@@] op."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
-#, fuzzy
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
-msgstr "Handel annulleret."
+msgstr ""
 
-#: src/localplayer.cpp:3455
-#, fuzzy
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
-msgstr "Skift e-mail adresse"
+msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
-#, fuzzy
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
-msgstr "Handel annulleret."
+msgstr ""
 
-#: src/localplayer.cpp:3817
-#, fuzzy
+#: src/localplayer.cpp:3849
 msgid "You see "
-msgstr "Du får %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4328,93 +4162,76 @@ msgid "Options:"
 msgstr "Indstillinger:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Ønsket konfigurationsfil"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Ønsket konfigurationsfil"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Vis versionsnummer"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Vis denne hjælpebesked"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Ønsket konfigurationsfil"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Anvend dette brugernavn"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Anvend dette password"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Log på som denne karakter"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Login server navn or IP"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Login server port"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -u --skip-update : Undlad at hente updateringer"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Vælg karakter-server og karakter"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Undlad at hente updateringer"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Directory med data til spillet"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Start mana uden OpenGL"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4428,2088 +4245,1228 @@ msgstr "Tak for købet."
 msgid "Unable to buy."
 msgstr "Du kan ikke købe."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Styrke"
-
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Styrke %+d"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Adræthed"
-
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Adræthed %+d"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Behændighed"
-
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Behændighed %+d"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Helbred"
-
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Helbred %+d"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Intelligens"
-
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligens %+d"
-
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrke:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Viljestyrke:"
-
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Du er død."
-
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Du er ikke så levende som du engang har været."
-
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Manden med leen griber ud efter din sjæl."
-
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
-"sted."
-
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
-
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Jeg går ud fra at dette ikke gik alt for godt."
-
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Du vil gerne have dine ejendele identificeret?"
-
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Udslettet."
-
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Det ser ud til at du fik du hoved udleveret til dig."
-
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
-
-#: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Tryk OK for at genopstå"
-
-#: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
-msgid "You Died"
-msgstr "Du er død"
-
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
-msgid "Not logged in."
-msgstr "Allerede logget ind"
-
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
-
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Du har brugt alle dine points"
-
-#: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Du har brugt alle dine points"
-
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ukendt fejl"
-
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Info"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
-msgid "Player deleted."
-msgstr "Karakteren er slettet"
-
-#: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Vælg hvor mange genstande du vil bytte."
-
-#: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ukendt fejl"
-
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "Der er ingen tilgængelige spilservere."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spiller rammer monster"
-
-#: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: : /join <chat-kanal>"
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s blev medlem af gruppen."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Ukendt kommando"
-
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "Oprettede en ny guild"
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Invitationen er afsendt."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Forkert magic_token"
-
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
-msgid "Already logged in."
-msgstr "Allerede logget ind"
-
-#: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
-msgid "Account banned."
-msgstr "Kontoen er slettet"
-
-#: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
-msgid "New password incorrect."
-msgstr "De nye password stemmer ikke overens."
-
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamle password var ikke korrekt."
-
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
-msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
-
-#: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nye email-adresse er ikke gyldig."
-
-#: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamle email-adresse er ikke gyldig."
-
-#: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nye  email-adresse eksisterer allerede."
-
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Du bruger en for gammel version af klienten."
-
-#: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Forkert brugernavn eller password"
-
-#: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
-msgid "Account banned"
-msgstr "Kontoen er slettet"
-
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Forkert brugernavn, password eller email-adresse."
-
-#: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
-msgid "Username already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
-
-#: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
-msgid "Email address already exists."
-msgstr "email-adressen er allerede benyttet af en anden bruger."
-
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s blev medlem af gruppen."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s afviste din invitation."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Kan modtager anmodninger om byttehandler."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerer anmodninger om byttehandler."
-
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vil gerne handle med dig. Accepterer du?"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handler med %s"
-
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Handel annulleret."
-
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Handel er komplet."
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Du kunne ikke sparke denne bruger af kanalen"
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Brugeren er sparket ud af kanalen"
-
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Tak for en god handel."
-
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Kunne ikke sælge."
-
-#: src/net/tmwa/buysellhandler.cpp:138
-#, fuzzy
-msgid "Unable to sell while trading."
-msgstr "Kunne ikke sælge."
-
-#: src/net/tmwa/buysellhandler.cpp:141
-#, fuzzy
-msgid "Unable to sell unsellable item."
-msgstr "Kunne ikke sælge."
-
-#: src/net/tmwa/charserverhandler.cpp:121
+#: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
-msgstr "Kan ikke bruge denne ID"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr "Ukendt fejl"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Karakteren kunne ikke oprettes. Måske er navnet allerede brug."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr "Forkert magic_token"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr "Karakteren er slettet"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr "Kunne ikke slette karakteren."
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Styrke:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Adræthed:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Helbred:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Intelligens:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Behændighed:"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Held:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:128
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Beskeden kunne ikke sendes. Modtageren er ikke logget på."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:136
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Bruger"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-#, fuzzy
+#: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr "Bruger"
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "Serveren understøtter ikke kanaler!"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Navn"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr "Anmodning om byttehandel."
-
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Styrke %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
-#, c-format
-msgid "Agility %+d"
-msgstr "Adræthed %+d"
-
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Vitality %+d"
-msgstr "Helbred %+d"
-
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligens %+d"
-
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Behændighed %+d"
-
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Held %+d"
-
-#: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Godkendelse fejlede"
-
-#: src/net/tmwa/generalhandler.cpp:141
-#, fuzzy
-msgid "No servers available."
-msgstr "Der er ingen tilgængelige servere"
-
-#: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "En anden bruger forsøger at logge ind på denne brugerkonto"
-
-#: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Der er allerede logget en bruger ind på denne  brugerkonto"
-
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Dit hastighedshack blev opdaget af serveren."
-
-#: src/net/tmwa/generalhandler.cpp:154
-msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:157
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Kunne ikke forbinde til serveren"
-
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "Blev smidt af serveren!"
-
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Held"
-
-#: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
-msgid "Defense"
-msgstr "Forsvar:"
-
-#: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Angreb:"
-
-#: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Forsvar:"
-
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy, no-c-format
-msgid "% Accuracy"
-msgstr "% præcission:"
-
-#: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
-msgid "% Evade"
-msgstr "% Undgå angreb."
-
-#: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
-msgid "% Critical"
-msgstr "Kritisk sår"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-#, fuzzy
-msgid "Attack Delay"
-msgstr "Angreb %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
-msgid "Walk Delay"
-msgstr "Angreb %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
-msgid "Attack Range"
-msgstr "Monster rammer spiller"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Vis denne hjælpebesked."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Inviter en spiller med i din gruppe"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/invite > Forlad den gruppe du er med i"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Spark en spiller ud a din gruppe"
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Kommand: /invite <spiller>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Denne kommando inviterer <spiller> til din gruppe."
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Kommando: /leave"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Denne kommando får dig til at forlade din gruppe"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Oprettede en ny guild"
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
+#: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "Ukendt invitations-svar fra %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
 msgid "Guild name: %s"
-msgstr "Opret en guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
 msgid "Guild master: %s"
-msgstr "Opret en guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
 msgid "Guild level: %d"
-msgstr "Niveau: %d"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
 msgid "Average level: %d"
-msgstr "Maks. level"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Opret en guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "Oprettede en ny guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
 msgid "Guild castle: %s"
-msgstr "Oprettede en ny guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s er nu medlem af din gruppe."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "Ukendt invitations-svar fra %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr "Du har foradt gruppen."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s har forladt gruppen."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
+#: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s er nu medlem af din gruppe."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Inviter en spiller med i din gruppe"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/invite > Forlad den gruppe du er med i"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Spark en spiller ud a din gruppe"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Vis/ret hvordan gruppen deler fundne tin"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/item > Vis/ret hvordan partyet deler exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "Denne kommando inviterer <spiller> til din gruppe."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "Denne kommando får dig til at forlade din gruppe"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "Kommand: /item <regel>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "Denne kommando ændrer hvordan gruppen deler fundne ting."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen alle fundne "
-"ting, men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke."
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "Kommando: /item"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "Denne kommando viser hvorvidt gruppen deler fundne ting."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "Kommando: /exp <regel>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Denne kommando viser hvorvidt gruppen deler experience points."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen experience, "
-"men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke "
-"experience."
 
-#: src/net/tmwa/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "Kommando: /exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "Denne kommando hvorvidt gruppen deler experience points."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "Fra nu af deler partyet fundne ting."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "Fra nu af deler partyet ikke fundne ting."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "Deling af fundne ting kunne ikke slås til."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:157
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Fra nu af deler partyet fundne ting."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "Fra nu af deler partyet experience points."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "Fra nu af deler gruppen ikke experience points."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "Deling af exp kunne ikke slås til."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:196
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "Fra nu af deler partyet experience points."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "Du kunne ikke bruge denne genstand."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:93
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Brugernavnet eksisterer ikke. log venligst ind igen."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "Det nye password er for kort."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Frameld"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Forkert brugernavn eller password"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "Kontoen er slettet"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Adgang til serveren blev nægtet."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du er blevet bandlyst permanent fra spillet. Kontakt en GM."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:180
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Du bruger en for gammel version af klienten."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Du er blevet bandlyst fra spillet indtil %s. Kontakt venligst en GM i "
-"forummet."
 
-#: src/net/tmwa/loginhandler.cpp:190
+#: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr "Dette brugernavn er allerede taget."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
-
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kunne ikke sælge."
-
-#: src/net/tmwa/network.cpp:426
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Opretter forbindelse til kort-serveren..."
-
-#: src/net/tmwa/partyhandler.cpp:86
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "Kunne ikke oprette gruppe."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "Du har nu oprettet gruppen."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s har forladt gruppen."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s er allerede medlem af en gruppe."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s afviste din invitation."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s er nu medlem af din gruppe."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Ukendt invitations-svar fra %s."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "Du har foradt gruppen."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s har forladt gruppen."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "Et ukendt medlem forsøgte at sige: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s er ikke medlem af din gruppe!"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "Du er død."
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "Du er ikke så levende som du engang har været."
+
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Manden med leen griber ud efter din sjæl."
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "Indsæt en mønt for at fortsætte."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
+"sted."
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "Jeg går ud fra at dette ikke gik alt for godt."
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr "Du vil gerne have dine ejendele identificeret?"
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Udslettet."
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr "Det ser ud til at du fik du hoved udleveret til dig."
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
+
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "Du er ikke død endnu. Du hviler dig bare."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "Du er ikke mere."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "Du er holdt op med at være til."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "Du er udløbet og er gået hen for at møde din skaber."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "Du er en hård nød at knække, men desværre død."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
-"Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
-"Norris."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "Din tid er ovre."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr "Drik noget syre."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "Du har stillet træskoene."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr "Du har spist af dødens pølse for den sidste gang."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "Du er en forhenværende spiller."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "Du er tabt bag en vogn."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "Besked"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "Du samlede op "
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
 msgid "You spent %s."
-msgstr "Du får %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Handel fejlede!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Emote fejlede!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Sæt dig fejlede!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Det lykkedes ikke at starte en chat."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Kunne ikke tilslutte sig gruppen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:173
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Kan ikke råbe!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Du er ikke nået til det rette Niveau endnu!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Utilstrækkelig HP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Utilstrækkelig SP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "Du har ingen memorandaer!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "Det kan du ikke gøre lige nu!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "Det ser ud til at du ikke har nok penge... :-)"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Du har behov for en rød krystal mere"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:212
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Du har behov for en blå krystal mere"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:215
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Du har for meget på dig, til at kunne gøre dette"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Hmm? Hvad er det?"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Warp mislykkede..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Kunne ikke stjæle noget som helst..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Giften havde ingen effekt..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vil gerne handle med dig. Accepterer du?"
 
-#: src/net/tmwa/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Du kan ikke handle. Handle partneren er for langt væk."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Du kan ikke handle. Karakteren findes ikke."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Handlen blev annulleret af en ukendt grund."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Byttehandel: %s og dig."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Byttehandel med %s blev afbrudt."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "En besked om at afbryde byttehandlen blev ikke opfattet."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
-"Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
-"vinduet."
 
-#: src/net/tmwa/tradehandler.cpp:264
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "Fejlede i at tilføje genstand af en ukendt grund."
-
-#: src/playerrelations.cpp:414
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:434
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:478
-msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
-msgid "Floating bubble"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel annulleret."
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
-#: src/resources/monsterdb.cpp:84
-msgid "unnamed"
-msgstr "unavngivet"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel er komplet."
 
-#: src/resources/itemdb.cpp:62
-#, c-format
-msgid "Attack %+d"
-msgstr "Angreb %+d"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Styrke"
 
-#: src/resources/itemdb.cpp:63
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "Defense %+d"
-msgstr "Forsvar %+d"
+msgid "Strength %+.1f"
+msgstr ""
 
-#: src/resources/itemdb.cpp:64
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Adræthed"
 
-#: src/resources/itemdb.cpp:65
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:168
-msgid "Unknown item"
-msgstr "Ukendt genstand"
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Niveau: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Flyt til venstre"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Du har brugt alle dine points"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Smiley"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Handl med %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Angrib %s@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Brug@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Annuller@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Hent fra lager@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorer %s@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Brug@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore||Ignorer %s fuldstændigt@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Inviter en spiller til din gruppe"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Spark spiller ud@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Brug@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|Angrib %s@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Spark spiller ud@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Tilføj navn til chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuller@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Saml %s op@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Tilføj til chat@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Brug@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Vælg OK"
-
-#~ msgid "-- Help --"
-#~ msgstr "--Hjælp--"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Vis denne hjælpebesked"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Vis dine koordinater på kortet"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Vis antallet af spillere der er online"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Vis en beskrivelse af dig"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Sletter text i chat-vinduet."
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Send en privat besked til en spiller"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Samme som msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Samme som msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Starter en privat samtale med en spiller"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Samme som query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Lukker hviskesamtale-tabben"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Vis alle offentlige chat-kanaler"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Deltag i en chat-kanal"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Opret en ny gruppe"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Opret en ny gruppe"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Inviter en spiller til din gruppe"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr ""
-#~ "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Vis en liste af alle spillere på serveren (Sendes til chat-"
-#~ "loggen hvis den er slået til)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Send en besked til allle spillere (Kun for GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Lukker hviskesamtale-tabben"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Send en privat besked til en spiller"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
-
-#~ msgid "Command: /help"
-#~ msgstr "Kommando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Kommando: /help <kommando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Denne kommando viser hjælp for <kommando>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Kommando: /announce <besked>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** kun tilgængelig for en GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Kommando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Denne kommando rydder chat loggen"
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Kommand: /item <regel>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Denne kommando viser det antal af online brugere, der er online  lige nu."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Kommando: : /join <chat-kanal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Denne kommando tilmelder dig til <chat-kanal>"
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Denne kommando viser en liste over alle chat-kanaler."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Kommando: /me <besked>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Kommando: /msg <spiller> <besked>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Kommando: /whisper <spiller> <besked>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Kommando: /w <spiller> <besked>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Denne kommando sender <besked> til <spiller>"
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Kommando: /query <spilller>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Kommando: /q <spiller>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Kommando: /w <spiller> <besked>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Kommando: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Denne kommando sætter kanalens emne til <besked>"
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Kommando: /create <gruppe>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Kommando: /create <gruppe>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Kommando: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Denne kommando finder en liste over brugere, der er inden for en "
-#~ "lytteradius, og sender listen til enten record loggen, hvis du optager, "
-#~ "ellers er det chat loggen."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Kommando /toggle <tilstand>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
-#~ "loggen, ellerom chat om chat loggen, automatisk skal slå fra."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå "
-#~ "fokusering af chat vindue til, eller \"0\", \"no\", \"false\" for at slå "
-#~ "fokusering af chat vindue fra."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Kommando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Denne kommando viser fokusering af chat vinduets status."
-
-#~ msgid "Command: /where"
-#~ msgstr "kommando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Denne kommando viser det nuværende bane navn."
-
-#~ msgid "Command: /who"
-#~ msgstr "Kommando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr ""
-#~ "Denne kommando viser det antal af online brugere, der er online  lige nu."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Skriv /help for at få en liste med kommandoer"
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Partikeldetaljer"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Omgivende FX"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Shortcut %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Spiller rammer monster"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Navn: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "MiniKort"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Gem/ chat i en lokal fil"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Kommando: /record <filnamn>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi "
-#~ "i <filnavn>"
-
-#~ msgid "Command: /record"
-#~ msgstr "Kommando: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Denne kommando stopper med at optage chatten."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Fremmøde skrives til loggen"
-
-#~ msgid "Finishing recording."
-#~ msgstr "Stop med at  optage chat"
-
-#~ msgid "Not currently recording."
-#~ msgstr "Du er ikke igang med at optage"
-
-#~ msgid "Already recording."
-#~ msgstr "Du er allerede igang med at  optage"
-
-#~ msgid "Starting to record..."
-#~ msgstr "Start optagelse"
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Fejl. Klienten kan ikke optage chat."
-
-#~ msgid "Recording..."
-#~ msgstr "Optager..."
-
-#~ msgid "Stop recording"
-#~ msgstr "Stop optagelse"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Gå hen hvor musen peger"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Penge: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Job:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Niveau: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Du har nu oprettet gruppen."
+msgid "Agility %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Behændighed"
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Ønsket konfigurationsfil"
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Ønsket konfigurationsfil"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Helbred"
 
-#~ msgid "Sound"
-#~ msgstr "Lyd"
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Adgang nægtet"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligens"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Der opstod en ukendt fejl da du valgte karakter"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Serveren understøtter ikke denne type invitationer endnu."
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s har inviteret med i sin gruppe"
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
 
-#~ msgid "Willpower:"
-#~ msgstr "Viljestyrke:"
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Handler med %s"
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Hvisk"
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Bliv ven med %s@@"
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Se bort fra"
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore||Ignorer %s fuldstændigt@@"
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Inviter %s med i din guild@@"
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Inviter %s med i din gruppe@@"
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Tal til %s@@"
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Spark monstret ud@@"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Saml op"
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Du kan ikke sende en tom chat-besked"
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#~ msgid "Text Shadow"
-#~ msgstr "Skygger"
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#~ msgid "Text Outline"
-#~ msgstr "Kontur"
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Du har ikke penge nok"
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Du har udrustet dig"
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Der er ingen tilgængelige spilservere."
 
-#~ msgid "Player"
-#~ msgstr "Bruger"
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr ""
 
-#~ msgid "Is"
-#~ msgstr "Er"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Ukendt genstand"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#~ msgid "Hats"
-#~ msgstr "Hatte"
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
 
-#~ msgid "Usables"
-#~ msgstr "Forbrugsvarer"
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#~ msgid "Shirts"
-#~ msgstr "Trøjer"
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Ethåndsvåben"
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#~ msgid "Pants"
-#~ msgstr "Bukser"
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#~ msgid "Shoes"
-#~ msgstr "Sko"
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Ethåndsvåben"
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Invitationen er afsendt."
 
-#~ msgid "Shields"
-#~ msgstr "Skjolde"
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
 
-#~ msgid "Rings"
-#~ msgstr "Ringe"
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
 
-#~ msgid "Necklaces"
-#~ msgstr "Halskæder"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
 
-#~ msgid "Arms"
-#~ msgstr "Våben"
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#~ msgid "HP Bar"
-#~ msgstr "HP tabel"
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "HP tabel 3/4 fuld"
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "HP tabel 1/2 fuld"
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "HP tabel 1/4 fuld"
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
 
-#~ msgid "no"
-#~ msgstr "nej"
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Ven"
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#~ msgid "Buddy List"
-#~ msgstr "Venner"
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Beskrivelse: %s"
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effekt: %s"
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Opret"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Jobniveau: %d"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#~ msgid "Present: "
-#~ msgstr "Til stede: "
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#~ msgid "Quit Guild"
-#~ msgstr "Forlad guild"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "O.K."
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#~ msgid "Recent:"
-#~ msgstr "Seneste:"
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Kast test-formular 1"
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s blev medlem af gruppen."
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Kast test-formular 2"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Kast test-formular 3"
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Kan modtager anmodninger om byttehandler."
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Tohåndsvåben"
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerer anmodninger om byttehandler."
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Hold op med at bruge@@"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Handler med %s"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Tag på@@"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Smid@@"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Brugeren er sparket ud af kanalen"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Opdel@@"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Tak for en god handel."
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Gem på lager@@"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Kunne ikke sælge."
 
-#~ msgid "Select Server"
-#~ msgstr "Vælg server"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Fejlede i at skifte til "
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#~ msgid "windowed"
-#~ msgstr "som vindue"
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Styrke %+d"
 
-#~ msgid "fullscreen"
-#~ msgstr "fuld skærm"
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Adræthed %+d"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystisk færdighed."
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Helbred %+d"
 
-#~ msgid "Weapons"
-#~ msgstr "Våben"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligens %+d"
 
-#~ msgid "Crafts"
-#~ msgstr "Håndværk"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Behændighed %+d"
 
-#~ msgid "Stats"
-#~ msgstr "Egenskaber"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Held %+d"
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Pris"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "Attack:"
-#~ msgstr "Angreb:"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Tilgode Status Points: %d"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "curl error "
-#~ msgstr "curl fejl "
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Buddys"
-#~ msgstr "Venner"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "Blev smidt af serveren!"
 
-#~ msgid "Party Window"
-#~ msgstr "Party-vindue"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Held"
 
-#~ msgid "Unarmed"
-#~ msgstr "Ubevæbnet"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "Kniv"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Sværd"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Stav"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Pisk"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Bue"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "Shooting"
-#~ msgstr "Missil-våben"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Mace"
-#~ msgstr "Kølle"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Axe"
-#~ msgstr "Økse"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "Craft"
-#~ msgstr "Håndværk"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Ukendt evne"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan ikke laves, men det findes ikke! Lukker."
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kunne ikke definere "
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s er ikke medlem af din gruppe!"
 
-#~ msgid " video mode: "
-#~ msgstr " skærm opsætning: "
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Opretter forbindelse til karakter-serveren..."
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Opretter forbindelse til bruger-serveren..."
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Samme som /create"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Kommando: /new <gruppe>"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "unavngivet"
 
-#~ msgid "Unnamed"
-#~ msgstr "Unavngivet"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Angreb %+d"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Følsomhed på mus"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Forsvar %+d"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Acceleration på mus"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Kan ikke loade valgte-billede.png"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Emote"
-#~ msgstr "Emote"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Ukendt genstand"
 
-#~ msgid "inc"
-#~ msgstr "inc"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default    : Overskriv login processen med normale indstillinger"
diff --git a/po/de.po b/po/de.po
index 301b721c5..7eb2d412b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -24,105 +24,106 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Unbekannter Update-Rechner: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -136,7 +137,7 @@ msgstr "Unbekannter Befehl."
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,152 +146,152 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -300,102 +301,102 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -409,7 +410,7 @@ msgstr "Preis: %s / Gesamt: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -417,30 +418,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Geschäft"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -449,19 +450,19 @@ msgstr "Verkaufen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -627,9 +628,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Löschen"
 
@@ -703,10 +704,10 @@ msgid "rainbow 3"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -714,12 +715,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -732,15 +733,15 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karte"
 
@@ -881,7 +882,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Schließen"
 
@@ -897,19 +898,19 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -918,7 +919,7 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -947,31 +948,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -980,17 +981,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1040,91 +1041,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1144,7 +1145,7 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1169,43 +1170,43 @@ msgstr "Registrieren"
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Muss"
 
@@ -1222,11 +1223,11 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1264,328 +1265,328 @@ msgstr "erstes ausziehen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
-#, fuzzy
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr "Verkaufen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Server wechseln"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
@@ -1621,65 +1622,64 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:239
-#, fuzzy
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Wähle deinen Server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -1747,9 +1747,8 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Befehl: /users"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1780,9 +1779,8 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Nachricht"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1793,34 +1791,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Alle privaten Nachrichten in Tabs öffnen"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1871,19 +1873,14 @@ msgstr "Blau: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1928,311 +1925,368 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
-#, fuzzy
+#: src/gui/setup_other.cpp:103
 msgid "Player"
-msgstr "Spieler"
+msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Protokoliere NPC Gespräche"
 
-#: src/gui/setup_other.cpp:149
-#, fuzzy
+#: src/gui/setup_other.cpp:148
 msgid "Other"
-msgstr "andere"
+msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Beziehung"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Freund"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Unbeachtet"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignoriert"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Handeln erlauben"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Flüstern erlauben"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Alle privaten Nachrichten in Tabs öffnen"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Wenn ignorierend:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Sichtbare Namen"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Sichtbare Namen"
-
-#: src/gui/setup_players.cpp:341
-#, fuzzy
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
-msgstr "Status"
+msgstr ""
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Beziehung"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Freund"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Unbeachtet"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Handeln erlauben"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Flüstern erlauben"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2284,138 +2338,118 @@ msgstr "Mittel"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "im Chatfenster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
@@ -2444,7 +2478,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
@@ -2486,7 +2521,7 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilde"
 
@@ -2518,7 +2553,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
@@ -2680,502 +2715,502 @@ msgstr ""
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "andere"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3212,48 +3247,48 @@ msgstr "Du gibst:"
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Du hast nicht genügend Geld."
+
+#: src/gui/tradewindow.cpp:453
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Du hast nicht genügend Geld."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3405,23 +3440,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3486,6 +3521,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
@@ -3527,6 +3563,10 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Anderen Spieler ignorieren"
@@ -3655,11 +3695,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -3918,9 +3958,8 @@ msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Nächster Tab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4053,68 +4092,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
@@ -4222,82 +4261,496 @@ msgstr "Vielen Dank für den Einkauf."
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Stärke"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Beweglichkeit"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ausdauer"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Gilde erstellt."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Gesundheit"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligenz"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Willenskraft:"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Altes Passwort fehlerhaft"
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Unbekannter Fehler"
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4305,7 +4758,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4313,33 +4766,308 @@ msgstr ""
 "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
 "nicht ganz so genial, wie Du dachtest..."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein "
 "paar Neue."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s möchte mit dir handeln, stimmst du zu?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Stärke"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Beweglichkeit"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ausdauer"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Gesundheit"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligenz"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Willenskraft:"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Drücke \"OK\" um neu anzufangen."
@@ -4393,16 +5121,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Unbekannter Fehler"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Spieler gelöscht"
@@ -4466,10 +5184,6 @@ msgstr "%s hat %s gekickt."
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Gilde erstellt."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Fehler beim Erstellen der Gilde."
@@ -4502,10 +5216,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Altes Passwort fehlerhaft"
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
@@ -4584,24 +5294,11 @@ msgstr "Akzeptiere eingehende Handelsanfragen."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst du zu?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Handele mit %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
@@ -4792,376 +5489,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
-
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Kann diese ID nicht benutzen"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name "
-#~ "bereits vergeben."
-
-#~ msgid "Character deleted."
-#~ msgstr "Spieler gelöscht."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Spieler konnte nicht gelöscht werden."
-
-#~ msgid "Strength:"
-#~ msgstr "Stärke:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilität:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalität:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenz:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Geschicklichkeit:"
-
-#~ msgid "Luck:"
-#~ msgstr "Glück:"
-
-#~ msgid "MVP player."
-#~ msgstr "Spieler"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanäle werden nicht unterstützt!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Benutzer online: %d"
-
-#~ msgid "Game"
-#~ msgstr "Spiel"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Diese Hilfe anzeigen"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Befehl: /invite <Name>"
-
-#~ msgid "Command: /leave"
-#~ msgstr "Befehl: /leave"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Konnte User nicht in Gilde einladen."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Deine Gilde ist voll."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Werfe jemanden aus Deiner Party"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr ""
-#~ "/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
-#~ "Party"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr ""
-#~ "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in "
-#~ "der Party"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Dieser Befehl lässt Dich die Party verlassen"
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Befehl: /item <Wert>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in "
-#~ "einer Party."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
-#~ "Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
-
-#~ msgid "Command: /item"
-#~ msgstr "Befehl: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
-#~ "nicht."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Befehl: /exp <Wert>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
-#~ "erlauben, \"0\",\"no\",\"false\" verbieten es."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Befehl: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
-#~ "aktiviert ist."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Teilen von Gegenständen aktiviert."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Teilen von Gegenständen deaktiviert."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Teilen von Gegenständen nicht möglich."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Teilen der Erfahrungspunkte aktiviert."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Teilen der Erfahrungspunkte deaktiviert."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Teilen der Erfahrungspunkte nicht möglich."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Gegenstand konnte nicht benutzt werden."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Kann Gegenstand nicht Ausrüsten."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
-
-#~ msgid "New password too short."
-#~ msgstr "Das neue Passwort ist zu kurz"
-
-#~ msgid "Unregistered ID."
-#~ msgstr "Unbekannte ID"
-
-#~ msgid "Wrong password."
-#~ msgstr "Falsches Passwort"
-
-#~ msgid "Account expired."
-#~ msgstr "Account abgelaufen"
-
-#~ msgid "Rejected from server."
-#~ msgstr "Vom Server zurückgewiesen"
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
-#~ "Team."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
-#~ "Bitte wende dich mittels des Forums an das GM Team."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Dieser Spielername ist bereits vergeben"
-
-#~ msgid "Could not create party."
-#~ msgstr "Konnte Party nicht erstellen."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Party erfolgreich erstellt."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s ist bereits Mitglied einer Party."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s hat Deine Einladung zurückgewiesen."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s ist nun Mitglied Deiner Party."
-
-#~ msgid "You have left the party."
-#~ msgstr "Du hast die Party verlassen."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s hat Deine Party verlassen."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Gib eine Münze ein um weiter zuspielen."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Du bist nicht tot. Du erholst Dich bloß."
-
-#~ msgid "You are no more."
-#~ msgstr "Du bist nicht mehr."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Du bist ein wenig steif."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Des Lebens beraubt ruhst Du in Frieden."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr ""
-#~ "Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
-#~ "sehen."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Deine Körperfunktionen sind nun Geschichte."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Du kriegst nichts mehr mit."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Jetzt passt Du in 'nen Eimer."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
-#~ "und Du trittst dem Chor der blutenden Unsichtbaren bei."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Du warst einmal ein Spieler."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Du schmachtest nach den Fjorden."
-
-#~ msgid "Message"
-#~ msgstr "Nachricht"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
-#~ "heilen."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Du hast %s aufgehoben "
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Kann Skill nicht erhöhen!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Rüste dich zuerst mit Pfeilen aus."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Handel fehlgeschlagen!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Emote fehlgeschlagen!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Sitzen fehlgeschlagen!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Chat-Erstellung fehlgeschlagen!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Kann der Gruppe nicht beitreten!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Kann nicht rufen!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Dein Level ist noch nicht hoch genug!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Nicht genug HP!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Nicht genug SP!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Keine Memos vorhanden!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Du kannst dies momentan nicht tun!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Du brauchst noch einen roten Edelstein!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Du brauchst noch einen blauen Edelstein!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Du schleppst zu viel herum um das zu machen!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Eha? Was ist das?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Warp fehlgeschlagen..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Konnte nichts stehlen..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Das Gift hatte keine Wirkung..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Handel nicht möglich. Spieler existiert nicht."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Handel aus unbekanntem Grund abgebrochen"
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Handel: Du und %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Handel mit %s abgebrochen."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Übergangenes Handelsabbruchspaket."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr ""
-#~ "Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen "
-#~ "freien Platz mehr."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
diff --git a/po/en_GB.po b/po/en_GB.po
index 2adb8fad6..adb783313 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,128 +1,127 @@
-# English (United Kingdom) translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Necromonger <Necromong@inbox.ru>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2010-03-04 21:01+0000\n"
-"Last-Translator: issyl0 <isabell121@gmail.com>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1030
-#, fuzzy
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr "Visible names"
+msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
-msgstr ""
+msgstr "dodge"
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
+msgstr "miss"
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
 msgstr ""
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:900
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Connecting to map server..."
+msgstr "Connecting to server"
 
-#: src/client.cpp:931
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Login"
+msgstr "Logging in"
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
-msgstr ""
+msgstr "Entering game world"
 
-#: src/client.cpp:1056
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Select Character"
+msgstr "Requesting characters"
 
-#: src/client.cpp:1087
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "Connecting to map server..."
+msgstr "Connecting to the game server"
 
-#: src/client.cpp:1097
-#, fuzzy
+#: src/client.cpp:1113
 msgid "Changing game servers"
-msgstr "Server"
+msgstr "Changing game servers"
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Requesting registration details"
 
-#: src/client.cpp:1177
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Password:"
+msgstr "Password Change"
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1197
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Change"
+msgstr ""
 
-#: src/client.cpp:1198
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "Member was promoted successfully."
+msgstr ""
 
-#: src/client.cpp:1218
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Unregister"
+msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1612
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Invalid update host: "
+msgstr ""
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -138,25 +137,24 @@ msgstr "Cannot send empty whispers!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Requesting to join channel %s."
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
 #: src/commandhandler.cpp:456
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Party name is missing."
+msgstr ""
 
 #: src/commandhandler.cpp:469 src/commandhandler.cpp:576
 #: src/commandhandler.cpp:617 src/commandhandler.cpp:647
@@ -180,34 +178,31 @@ msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
 #: src/commandhandler.cpp:555
-#, fuzzy
 msgid "friend"
-msgstr "Friend"
+msgstr ""
 
 #: src/commandhandler.cpp:560
-#, fuzzy
 msgid "disregarded"
-msgstr "Disregarded"
+msgstr ""
 
 #: src/commandhandler.cpp:565
-#, fuzzy
 msgid "neutral"
-msgstr "Neutral"
+msgstr ""
 
 #: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
 #: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Party successfully created."
+msgstr ""
 
 #: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
 #: src/commandhandler.cpp:628
 msgid "Player wasn't ignored!"
@@ -218,24 +213,20 @@ msgid "Player no longer ignored!"
 msgstr ""
 
 #: src/commandhandler.cpp:637
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
 #: src/commandhandler.cpp:654
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
 #: src/commandhandler.cpp:665
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Party successfully created."
+msgstr ""
 
 #: src/commandhandler.cpp:667
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
 #: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
@@ -278,24 +269,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "font cache size"
-msgstr "Font size"
+msgstr ""
 
 #: src/commandhandler.cpp:1094
-#, fuzzy
 msgid "Cache size:"
-msgstr "Font size"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Create"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Delete"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -310,108 +297,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
-#, fuzzy
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Screenshot saved to ~/"
+msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:511
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "The connection to the server was lost, the program will now quit."
+msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/game.cpp:1425
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Could not load map"
+msgstr ""
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
 
-#: src/gui/beingpopup.cpp:108
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Party (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:122
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:132
+#, c-format
 msgid "Guild: %s"
-msgstr "Guilds"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:146
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:156
+#, c-format
 msgid "Comment: %s"
-msgstr "Command: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Chat Window"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attack"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Talk"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
-msgstr "Move Up"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Buy"
 
@@ -440,7 +421,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Exit"
 
@@ -451,31 +432,31 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Shop"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sell"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -491,24 +472,22 @@ msgid "Account: %s"
 msgstr "Account: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Type new email address twice:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "The username needs to be at least %d characters long."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "The username needs to be less than %d characters long."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "The new Email Address already exists."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -521,23 +500,22 @@ msgid "Password:"
 msgstr "Password:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Type new password twice:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "The password needs to be at least %d characters long."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "The password needs to be less than %d characters long."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -567,14 +545,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Hair Colour:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Hair Style:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -633,82 +609,71 @@ msgid "Unregister"
 msgstr "Unregister"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Change Email Address"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Wrong password"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Failed to delete character."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Wrong password"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Delete"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Close"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Default"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Friend"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Green: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Blue: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "low"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hyperlink"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -719,30 +684,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Thrown"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Rainbow"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Rainbow"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Rainbow"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -750,12 +711,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:589
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d players are present."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -769,61 +730,53 @@ msgid "No"
 msgstr "No"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
-#, fuzzy
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
-msgstr "Ignored"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Map"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Move Left"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Next"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Topic: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Name: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "MiniMap"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Custom cursor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Player hits Monster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Particle Effects"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -855,51 +808,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Particle Effects"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Move Left"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Target Player"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Target Player"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Target Player"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Target Player"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Attack %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "MiniMap"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -908,9 +854,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Critical Hit"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -932,28 +877,25 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Close"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Previous"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Next"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
@@ -961,10 +903,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -972,84 +914,80 @@ msgstr "Unequip"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "Slots:"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-#, fuzzy
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:121
-#, fuzzy
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
-msgstr "a"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-#, fuzzy
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
-msgstr "a"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Drop"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Drop"
@@ -1087,107 +1025,103 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Unknown error"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Weight: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Status Window"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Reset"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Reset"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Price: %s / Total: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1196,9 +1130,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Close"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1218,9 +1151,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Remember Username"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1231,18 +1163,16 @@ msgid "Register"
 msgstr "Register"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
 #: src/gui/ministatus.cpp:59
 msgid "health bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:65
-#, fuzzy
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
 #: src/gui/ministatus.cpp:77
 msgid "experience bar"
@@ -1253,27 +1183,24 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:92
-#, fuzzy
 msgid "weight bar"
-msgstr "Weight: "
+msgstr ""
 
 #: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:98
-#, fuzzy
 msgid "money bar"
-msgstr "Monster hits Player"
+msgstr ""
 
 #: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:104
-#, fuzzy
 msgid "status bar"
-msgstr "Status"
+msgstr ""
 
 #: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
@@ -1292,18 +1219,17 @@ msgid "Submit"
 msgstr "Submit"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
-msgstr "Polearm"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Next"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1323,364 +1249,329 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Money: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Unequip"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trade"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
-msgstr "Whisper"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
-#, fuzzy
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
-msgstr "Friend"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
-#, fuzzy
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
-msgstr "Disregarded"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
-#, fuzzy
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
-msgstr "Ignored"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Completely ignore %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
-#, fuzzy
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
-msgstr "low"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
-#, fuzzy
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
-msgstr "Change Email Address"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
-msgstr "/party > Invite a user to party"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
-#, fuzzy
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
-msgstr "@@admin-kick|Kick player@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
-#, fuzzy
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
-msgstr "@@admin-kick|Kick player@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
-#, fuzzy
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
-msgstr "Change"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
-#, fuzzy
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
-msgstr "/party > Invite a user to party"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
-#, fuzzy
 msgid "Kick player"
-msgstr "Kick failed!"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
-msgstr "Show name"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
-#, fuzzy
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
-msgstr "@@attack|Attack %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:296
-#, fuzzy
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
-msgstr "@@attack|Attack %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:299
-#, fuzzy
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
-#, fuzzy
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
-msgstr "@@chat|Add to chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:461
-#, fuzzy
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
-msgstr "Pick up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
-#, fuzzy
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
-msgstr "@@chat|Add to chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
-msgstr "Remember Username"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
-#, fuzzy
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
-msgstr "Remember Username"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
-#, fuzzy
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
-msgstr "Tab Highlight"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:545
-#, fuzzy
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
-msgstr "Tab Highlight"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
-msgstr "Remember Username"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
-msgstr "Unable to buy."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
-msgstr "Allow/Disallow Trading"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Large"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:715
-#, fuzzy
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
-msgstr "Change"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
-#, fuzzy
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
-msgstr "@@chat|Add to chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
-#, fuzzy
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
-msgstr "@@chat|Add to chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
-#, fuzzy
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
-#, fuzzy
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
-#, fuzzy
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1567
-#, fuzzy
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1569
-#, fuzzy
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
-msgstr "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
-msgstr "Drop"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
-msgstr "Retrieve"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1611
-#, fuzzy
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
-msgstr "Retrieve"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
-#, fuzzy
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
-msgstr "Retrieve"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
-#, fuzzy
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
-msgstr "@@chat|Add to chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Default"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
-#, fuzzy
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
-msgstr "Move Up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
-#, fuzzy
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
-msgstr "Move Down"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
@@ -1727,14 +1618,12 @@ msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
 #: src/gui/serverdialog.cpp:228
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Choose your server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Choose your server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1745,23 +1634,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:287
-#, fuzzy
 msgid "Connect"
-msgstr "Connecting..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:288
-#, fuzzy
 msgid "Custom Server"
-msgstr "Custom cursor"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
@@ -1773,9 +1659,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:556
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Waiting for server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
@@ -1807,14 +1692,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Enable joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Enable joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1833,9 +1716,8 @@ msgid "Music volume"
 msgstr "Music volume"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "No text"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1845,67 +1727,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Colours"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-#, fuzzy
-msgid "Enable trade tab"
-msgstr "Unable to buy."
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Put all whispers in tabs"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Unable to buy."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:91
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Show name"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:94
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Next Chat Tab"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1913,14 +1823,9 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Colours"
-
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Type: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1942,39 +1847,34 @@ msgid "Spectrum"
 msgstr "Spectrum"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Delay: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Red: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Green: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Blue: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -2011,9 +1911,8 @@ msgid "Assign"
 msgstr "Assign"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Assign"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2027,487 +1926,515 @@ msgstr "Key Conflict(s) Detected."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monsters"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Unable to buy."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Highlight"
+msgid "Show monster hp bar"
+msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-#, fuzzy
-msgid "Highlight floor items"
-msgstr "Highlight"
-
 #: src/gui/setup_other.cpp:67
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Enable joystick"
+msgid "Show warps particles"
+msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-#, fuzzy
-msgid "Show warps particles"
-msgstr "as particle"
+msgid "Highlight floor items"
+msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Show name"
+msgid "Moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
-#, fuzzy
-msgid "Show own hp bar"
-msgstr "Show name"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Enable joystick"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-#, fuzzy
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
-msgstr "Message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
 
-#: src/gui/setup_other.cpp:114
-#, fuzzy
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr "Unable to buy."
+msgstr ""
 
-#: src/gui/setup_other.cpp:117
-#, fuzzy
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr "Allow/Disallow Trading"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
-#, fuzzy
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
-msgstr "Unable to buy."
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Players"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Visible names"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Friend"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Disregarded"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignored"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Allow trading"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Allow whispers"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Put all whispers in tabs"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Show name"
-
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Players"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "When ignoring:"
 
-#: src/gui/setup_players.cpp:313
-#, fuzzy
-msgid "Show level"
-msgstr "Show name"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:317
-#, fuzzy
-msgid "Show own name"
-msgstr "Show name"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:321
-#, fuzzy
-msgid "Target dead players"
-msgstr "Target Player"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:325
-#, fuzzy
-msgid "Secure trades"
-msgstr "Agree trade"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-#, fuzzy
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
-msgstr "Particle Effects"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-#, fuzzy
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr "Help"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
-msgstr "Agree trade"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:241
-#, fuzzy
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Font size"
+
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr "Change"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Tiny"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Small"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Medium"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Large"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-#, fuzzy
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:224
-#, fuzzy
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "No text"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bubbles, no names"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bubbles with names"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:328
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Relation"
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Visible names"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Particle effects"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Show pickup notification"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "as particle"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Enable joystick"
-
-#: src/gui/setup_video.cpp:353
-#, fuzzy
-msgid "Show background"
-msgstr "Background"
-
-#: src/gui/setup_video.cpp:358
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS Limit:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
-#, fuzzy
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr "FPS Limit:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Overhead text"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:380
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Particle Detail"
-
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Font size"
+msgstr ""
 
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "No"
+msgstr ""
 
-#: src/gui/setup_video.cpp:583
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:589
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:600
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Switching to full screen"
+msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:613
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Changing OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Screen resolution changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Particle effect settings changed."
+msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Changes will take effect on map change."
 
@@ -2524,7 +2451,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Add"
 
@@ -2536,15 +2463,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s wants to trade with you, do you accept?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2555,31 +2482,31 @@ msgid "Up"
 msgstr "Up"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Skill points: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Skill points: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Skills"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
@@ -2589,9 +2516,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Guild created."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2603,23 +2530,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Create Guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Are you sure you want to quit?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Invite a user to party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2627,9 +2553,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Invite a user to party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2641,75 +2566,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Are you sure you want to quit?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Attack"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Attack"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignored"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Create Guild"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Create Character"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Invite User"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Accepted invite from %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Rejected invite from %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Accepted invite from %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Rejected invite from %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Error creating guild."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2717,43 +2637,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Choose your server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Received party request, but one already exists."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s has invited you to join the %s party."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Accept Party Invite"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s has invited you to join their party."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s has invited you to join the %s party."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2774,263 +2689,254 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Choose your server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Move Left"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Move Left"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Attack"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Switch character"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Switch character"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Switch character"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Keyboard"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3068,19 +2974,19 @@ msgid "Job:"
 msgstr "Job:"
 
 #: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Character stats OK"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Skill points: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
 #: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
@@ -3209,99 +3115,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Move Left"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Allow trading"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Move Left"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "General"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magic"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magic"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Command: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magic"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Command: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Target Player"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Max level"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Show name"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3325,25 +3219,26 @@ msgstr "Agreed. Waiting..."
 msgid "Trade: You"
 msgstr "Trade: You"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "You get %s."
+msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Failed adding item. You can not overlap one kind of item on the window."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
@@ -3364,22 +3259,21 @@ msgstr "Connecting..."
 msgid "Play"
 msgstr "Play"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1  you try again later"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Completed"
 
@@ -3388,24 +3282,20 @@ msgid "Being"
 msgstr "Being"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Friend"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Disregarded"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignored"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM Names"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3423,28 +3313,21 @@ msgstr "GM Names"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monsters"
-
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Monster hits Player"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Party"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Guild"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3459,42 +3342,36 @@ msgid "Exp Notification"
 msgstr "Exp Notification"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Monster hits Player"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Player hits Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Monster hits Player"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Other Players' Names"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Critical Hit"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Player hits Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Player hits Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3505,29 +3382,24 @@ msgid "Misses"
 msgstr "Misses"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Tab Highlight"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Highlight"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Highlight"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Highlight"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Tab Highlight"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3538,9 +3410,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Monster hits Player"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3554,23 +3425,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3635,7 +3506,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "This command makes <nick> a channel operator."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
 
@@ -3669,9 +3540,9 @@ msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s whispers: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3694,33 +3565,29 @@ msgid "This command closes the current whisper tab."
 msgstr "This command closes the current whisper tab."
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Command: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "This command displays the number of players currently online."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Command: /item <policy>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "This command starts recording the chat log to the file <filename>."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Chat Window"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3735,9 +3602,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Smiley"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3772,9 +3638,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Shortcut"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3797,23 +3662,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Select OK"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Change"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Choose your server"
+msgstr ""
 
 #: src/inventory.cpp:248
 msgid "Storage"
-msgstr "Storage"
+msgstr ""
 
 #: src/inventory.cpp:250
 msgid "Cart"
@@ -3840,9 +3702,8 @@ msgid "Target & Attack"
 msgstr "Target & Attack"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Move Left"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3869,9 +3730,8 @@ msgid "Stop Attack"
 msgstr "Stop Attack"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Target Closest"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3906,14 +3766,12 @@ msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Change Email Address"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Item Shortcut %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -3925,7 +3783,7 @@ msgstr "Item Shortcut %d"
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Item Shortcut %d"
@@ -3971,43 +3829,36 @@ msgid "Debug Window"
 msgstr "Debug Window"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Skill Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Emote Shortcut Window"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Status Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Setup Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Hide Windows"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Status Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Command: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Chat Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4018,14 +3869,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Previous Chat Tab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Next Chat Tab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4049,7 +3898,7 @@ msgstr "Next Chat Tab"
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote Shortcut %d"
@@ -4086,219 +3935,205 @@ msgstr "Previous Chat Tab"
 msgid "Next Chat Tab"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr "Previous Chat Tab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:279
-#, fuzzy
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr "Next Chat Tab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "Select OK"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
-#, fuzzy
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr "Move Down"
+msgstr ""
 
-#: src/keyboardconfig.cpp:295
-#, fuzzy
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr "Move Left"
+msgstr ""
 
-#: src/keyboardconfig.cpp:296
-#, fuzzy
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr "Move Right"
+msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
-#, fuzzy
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr "Switch character"
+msgstr ""
 
-#: src/keyboardconfig.cpp:316
-#, fuzzy
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
-#, fuzzy
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr "Target & Attack"
+msgstr ""
 
-#: src/keyboardconfig.cpp:322
-#, fuzzy
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr "Change Password"
+msgstr ""
 
-#: src/keyboardconfig.cpp:324
-#, fuzzy
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr "Change Email Address"
+msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
-#, fuzzy
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr "Allow/Disallow Trading"
+msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
-#, fuzzy
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
-msgstr "Unable to pick up item."
+msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
-#, fuzzy
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
-msgstr "Server is full"
+msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
-#, fuzzy
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
-msgstr "Unable to pick up item."
+msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
-#, fuzzy, c-format
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "You picked up %s [@@%d|%s@@]."
-msgstr[1] "You picked up %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
-#, fuzzy
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
-msgstr "Trade canceled."
+msgstr ""
 
-#: src/localplayer.cpp:3455
-#, fuzzy
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
-msgstr "Change Email Address"
+msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
-#, fuzzy
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
-msgstr "Trade canceled."
+msgstr ""
 
-#: src/localplayer.cpp:3817
-#, fuzzy
+#: src/localplayer.cpp:3849
 msgid "You see "
-msgstr "You get %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4321,93 +4156,76 @@ msgid "Options:"
 msgstr "Options:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Configuration file to use"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Configuration file to use"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Display the version"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Display this help"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Configuration file to use"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Login with this username"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Login with this password"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Login with this character"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Login server name or IP"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Login server port"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Use this update host"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Choose default character server and character"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Skip the update downloads"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Directory to load game data from"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Directory to use as home directory"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Directory to use as home directory"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Disable OpenGL for this session"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4421,2100 +4239,1230 @@ msgstr "Thanks for buying."
 msgid "Unable to buy."
 msgstr "Unable to buy."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Strength"
-
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Strength %+d"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Agility"
-
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Agility %+d"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Dexterity"
-
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Dexterity %+d"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Vitality"
-
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitality %+d"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligence %+d"
-
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Willpower %+d"
-
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "You are dead."
-
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "We regret to inform you that your character was killed in battle."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "You are not that alive anymore."
-
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "The cold hands of the grim reaper are grasping for your soul."
-
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Your plan of breaking your enemy's weapon by bashing it with your throat "
-"failed."
-
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "I guess this did not run too well."
-
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Do you want your possessions identified?"
-
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Sadly, no trace of you was ever found..."
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Annihilated."
-
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Looks like you got your head handed to you."
-
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"You screwed up again, dump your body down the tubes and get yourself another "
-"one."
-
-#: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Press OK to respawn"
-
-#: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
-msgid "You Died"
-msgstr "You died"
-
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
-msgid "Not logged in."
-msgstr "Already logged in"
-
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Username already exists"
-
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Character stats OK"
-
-#: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Character stats OK"
-
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
-
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Info"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
-msgid "Player deleted."
-msgstr "Character deleted."
-
-#: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Select amount of items to trade."
-
-#: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unknown error"
-
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "No gameservers are available."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Topic: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Player hits Monster"
-
-#: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Command: /join <channel>"
-
-#: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
-msgid "Listing channels."
-msgstr "Requesting to join channel %s."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s joined the party."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Unknown command."
-
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "Guild created."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Error creating guild."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Invite sent."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Member was promoted successfully."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Failed to promote member."
-
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Wrong magic_token"
-
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
-msgid "Already logged in."
-msgstr "Already logged in"
-
-#: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
-msgid "Account banned."
-msgstr "Account expired"
-
-#: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
-msgid "New password incorrect."
-msgstr "New password incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Old password incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
-msgstr "Account not connected. Please login first."
-
-#: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "New email address incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Old email address incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "The new Email Address already exists."
-
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Client version is too old"
-
-#: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Wrong username or password"
-
-#: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
-msgid "Account banned"
-msgstr "Account expired"
-
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Wrong username, password or email address"
-
-#: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
-msgid "Username already exists."
-msgstr "Username already exists"
-
-#: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
-msgid "Email address already exists."
-msgstr "Email address already exists"
-
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Joined party."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s joined the party."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s refused your invitation."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Accepting incoming trade requests."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoring incoming trade requests."
-
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wants to trade with you, do you accept?"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Trading with %s"
-
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Trade canceled."
-
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Trade completed."
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Kick failed!"
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Kick succeeded!"
-
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Thanks for selling."
-
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Unable to sell."
-
-#: src/net/tmwa/buysellhandler.cpp:138
-#, fuzzy
-msgid "Unable to sell while trading."
-msgstr "Unable to sell."
-
-#: src/net/tmwa/buysellhandler.cpp:141
-#, fuzzy
-msgid "Unable to sell unsellable item."
-msgstr "Unable to pick up item."
-
-#: src/net/tmwa/charserverhandler.cpp:121
+#: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
-msgstr "Cannot use this ID"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr "Unknown error"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr "Wrong magic_token"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr "Character deleted."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr "Failed to delete character."
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Strength:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Agility:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Vitality:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Intelligence:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Dexterity:"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Luck:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:128
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Whisper could not be sent, user is offline."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:136
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Whisper could not be sent, ignored by user."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Player"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-#, fuzzy
+#: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr "Player"
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Name"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr "Request for Trade"
-
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Strength %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
-#, c-format
-msgid "Agility %+d"
-msgstr "Agility %+d"
-
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitality %+d"
-
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligence %+d"
-
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Dexterity %+d"
-
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Luck %+d"
-
-#: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Authentication failed"
-
-#: src/net/tmwa/generalhandler.cpp:141
-#, fuzzy
-msgid "No servers available."
-msgstr "No servers available"
-
-#: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Someone else is trying to use this account"
-
-#: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "This account is already logged in"
-
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Speed hack detected"
-
-#: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
-msgid "Duplicated login."
-msgstr "Duplicated login"
-
-#: src/net/tmwa/generalhandler.cpp:157
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Unknown connection error"
-
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "Disconnected from server!"
-
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Luck"
-
-#: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
-msgid "Defense"
-msgstr "Defense:"
-
-#: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
-msgid "M.Attack"
-msgstr "M.Attack:"
-
-#: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
-msgid "M.Defense"
-msgstr "M.Defense:"
-
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy, no-c-format
-msgid "% Accuracy"
-msgstr "% Accuracy:"
-
-#: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
-msgid "% Evade"
-msgstr "% Evade:"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
-msgid "% Critical"
-msgstr "Critical Hit"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-#, fuzzy
-msgid "Attack Delay"
-msgstr "Attack %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
-msgid "Walk Delay"
-msgstr "Attack %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
-msgid "Attack Range"
-msgstr "Monster hits Player"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Display this help."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite a player to your party"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Leave the party you are in"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Kick some one from the party you are in"
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Command: /invite <nick>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "This command invites <nick> to party with you."
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "This command causes the player to leave the party."
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guild created."
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Error creating guild."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
+#: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "Unknown invite response for %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
 msgid "Guild name: %s"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
 msgid "Guild master: %s"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
 msgid "Guild level: %d"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
 msgid "Average level: %d"
-msgstr "Max level"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "Guild created."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
 msgid "Guild castle: %s"
-msgstr "Guild created."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s is now a member of your party."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "Unknown invite response for %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr "You have left the party."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s has left your party."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
+#: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s is now a member of your party."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invite a player to your party"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > Leave the party you are in"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Kick some one from the party you are in"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Show/change party item sharing options"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Show/change party experience sharing options"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "This command invites <nick> to party with you."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "This command causes the player to leave the party."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "Command: /item <policy>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "This command changes the party's item sharing policy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "Command: /item"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "This command displays the party's current item sharing policy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "Command: /exp <policy>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "This command changes the party's experience sharing policy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 
-#: src/net/tmwa/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "Command: /exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "This command displays the party's current experience sharing policy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "Item sharing enabled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "Item sharing disabled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "Item sharing not possible."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:157
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Item sharing enabled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "Experience sharing enabled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "Experience sharing disabled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "Experience sharing not possible."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:196
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "Experience sharing enabled."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "Failed to use item."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "Unable to equip."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:93
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Account was not found. Please re-login."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "New password too short"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Unregistered ID"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Wrong password"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "Account expired"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Rejected from server"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"You have been permanently banned from the game. Please contact the GM Team."
 
-#: src/net/tmwa/loginhandler.cpp:180
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Client version is too old"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
 
-#: src/net/tmwa/loginhandler.cpp:190
+#: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr "This user name is already taken"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr "Username already exists"
-
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Unable to sell."
-
-#: src/net/tmwa/network.cpp:426
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Connecting to map server..."
-
-#: src/net/tmwa/partyhandler.cpp:86
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "Could not create party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "Party successfully created."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s has left your party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s is already a member of a party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s refused your invitation."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s is now a member of your party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Unknown invite response for %s."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "You have left the party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s has left your party."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "An unknown member tried to say: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s is not in your party!"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "You are dead."
+
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "We regret to inform you that your character was killed in battle."
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "You are not that alive anymore."
+
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "The cold hands of the grim reaper are grasping for your soul."
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Your plan of breaking your enemy's weapon by bashing it with your throat "
+"failed."
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "I guess this did not run too well."
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr "Do you want your possessions identified?"
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Sadly, no trace of you was ever found..."
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Annihilated."
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr "Looks like you got your head handed to you."
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"You screwed up again, dump your body down the tubes and get yourself another"
+" one."
+
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "You're not dead yet. You're just resting."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "You are no more."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "You have ceased to be."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "You've expired and gone to meet your maker."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "You're a stiff."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "Bereft of life, you rest in peace."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "Your metabolic processes are now history."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr "You're off the twig."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "You've kicked the bucket."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "You are an ex-player."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "You're pining for the fjords."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "Message"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"You are carrying more than half your maximum load. You are unable to "
-"automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:353
-#, fuzzy
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"You are carrying more than half your maximum load. You are unable to "
-"automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "You picked up "
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
 msgid "You spent %s."
-msgstr "You get %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
-msgstr "Equip arrows first."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Trade failed!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Emote failed!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Sit failed!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Failed to create channel!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Could not join party!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:173
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Can not shout!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "You have not yet reached a high enough level!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Insufficient HP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Insufficient SP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "You have no memos!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "You can not do that right now!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "Seems you need more money... ;-)"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "You cannot use this skill with that kind of weapon!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "You need another red gem!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:212
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "You need another blue gem!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:215
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "You're carrying to much to do this!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Huh? What's that?"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Warp failed..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Could not steal anything..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wants to trade with you, do you accept?"
 
-#: src/net/tmwa/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Trading isn't possible. Trade partner is too far away."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Trading isn't possible. Character doesn't exist."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Trade cancelled due to an unknown reason."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Trade: You and %s"
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Trade with %s cancelled."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "Unhandled trade cancel packet."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Failed to add item. Trade partner is over weighted."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Failed to add item. Trade partner has no free slot."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Failed adding item. You can not overlap one kind of item on the window."
 
-#: src/net/tmwa/tradehandler.cpp:264
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "Failed to add item for unknown reason."
-
-#: src/playerrelations.cpp:414
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:434
-msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:481
-msgid "Floating bubble"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Trade canceled."
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
-#: src/resources/monsterdb.cpp:84
-msgid "unnamed"
-msgstr "unnamed"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Trade completed."
 
-#: src/resources/itemdb.cpp:62
-#, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Strength"
 
-#: src/resources/itemdb.cpp:63
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "Defense %+d"
-msgstr "Defense %+d"
+msgid "Strength %+.1f"
+msgstr ""
 
-#: src/resources/itemdb.cpp:64
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agility"
 
-#: src/resources/itemdb.cpp:65
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:168
-msgid "Unknown item"
-msgstr "Unknown item"
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Level: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Move Left"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Character stats OK"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Smiley"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Trade With %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Attack %s@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Use@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Cancel@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Retrieve@@"
-
-#, fuzzy
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Disregard %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignore %s@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Use@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Completely ignore %s@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Invite a user to party"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Kick player@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Use@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|Attack %s@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Kick player@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Add name to chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancel@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Pick up %s@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Add to chat@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Use@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Select OK"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Help --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Display this help"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Display map name"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Display number of online users"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Tell something about yourself"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Clears this window"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Send a private message to a user"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Alias of msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Alias of msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Makes a tab for private messages with another user"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Alias of query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Close the whisper tab"
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Disregard %s@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Display all public channels"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Join or create a channel"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Create a new party"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Create a new party"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Invite a user to party"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Determine whether <return> toggles the chat log"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Global announcement (GM only)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Close the whisper tab"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Send a private message to a user"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "For more information, type /help <command>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Command: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "This command displays a list of all commands available."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Command: /help <command>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "This command displays help on <command>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Command: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** only available to a GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "This command sends the message <msg> to all players currently online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Command: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "This command clears the chat log of previous chat."
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Command: /item <policy>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "This command displays the number of players currently online."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Command: /join <channel>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "This command makes you enter <channel>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "If <channel> doesn't exist, it's created."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "This command shows a list of all channels."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Command: /me <message>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "This command tell others you are (doing) <msg>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Command: /msg <nick> <message>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Command: /whisper <nick> <message>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Command: /w <nick> <message>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "This command sends the text <message> to <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Command: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Command: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "This command tries to make a tab for whispers between you and <nick>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Command: /w <nick> <message>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Command: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "This command sets the topic to <message>."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Command: /create <party-name>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "These commands create a new party called <party-name>."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Command: /create <party-name>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "These commands create a new party called <party-name>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Command: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Command: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "This command gets a list of players within hearing and sends it to either "
-#~ "the record log if recording, or the chat log otherwise."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Command: /toggle <state>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Command: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "This command displays the return toggle status."
-
-#~ msgid "Command: /where"
-#~ msgstr "Command: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "This command displays the name of the current map."
-
-#~ msgid "Command: /who"
-#~ msgstr "Command: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "This command displays the number of players currently online."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Type /help for a list of commands."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Particle Detail"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Ambient FX"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Emote Shortcut %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Player hits Monster"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Topic: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Name: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "MiniMap"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Start recording the chat to an external file"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Command: /record <filename>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr "This command starts recording the chat log to the file <filename>."
-
-#~ msgid "Command: /record"
-#~ msgstr "Command: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "This command finishes a recording session."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Attendance written to record log."
-
-#~ msgid "Finishing recording."
-#~ msgstr "Finishing recording."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Not currently recording."
-
-#~ msgid "Already recording."
-#~ msgstr "Already recording."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Starting to record..."
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Failed to start recording."
-
-#~ msgid "Recording..."
-#~ msgstr "Recording…"
-
-#~ msgid "Stop recording"
-#~ msgstr "Stop recording"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Find Path to Mouse"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Money: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Job:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Level: %d"
+msgid "Agility %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Party successfully created."
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Dexterity"
 
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Whisper could not be sent, ignored by user."
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Configuration file to use"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitality"
 
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Configuration file to use"
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
 
-#~ msgid "Sound"
-#~ msgstr "Sound"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligence"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Access denied"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Unknown failure to select character"
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Inviting like this isn't supported at the moment."
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s has invited you to join their party."
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
 
-#~ msgid "Willpower:"
-#~ msgstr "Willpower:"
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Trading with %s"
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Whisper"
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Befriend %s@@"
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Disregarded"
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Completely ignore %s@@"
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Invite %s to join your guild@@"
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Invite %s to join your party@@"
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Talk To %s@@"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Kick monster@@"
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Pick up"
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Cannot send empty chat!"
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#~ msgid "Unable to unequip."
-#~ msgstr "Unable to unequip."
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#~ msgid "Text Shadow"
-#~ msgstr "Text Shadow"
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
 
-#~ msgid "Text Outline"
-#~ msgstr "Text Outline"
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Progress Bar Labels"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "No gameservers are available."
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Item too expensive"
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr "Topic: %s"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Item is equipped"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
 
-#~ msgid "Player"
-#~ msgstr "Player"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#~ msgid "Is"
-#~ msgstr "Is"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Unknown Item Type"
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#~ msgid "Generics"
-#~ msgstr "Generics"
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#~ msgid "Hats"
-#~ msgstr "Hats"
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#~ msgid "Usables"
-#~ msgstr "Usables"
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Error creating guild."
 
-#~ msgid "Shirts"
-#~ msgstr "Shirts"
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Invite sent."
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 Handed Weapons"
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr "Member was promoted successfully."
 
-#~ msgid "Shoes"
-#~ msgstr "Shoes"
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr "Failed to promote member."
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 Handed Weapons"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
 
-#~ msgid "Shields"
-#~ msgstr "Shields"
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#~ msgid "Rings"
-#~ msgstr "Rings"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#~ msgid "Necklaces"
-#~ msgstr "Necklaces"
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#~ msgid "Arms"
-#~ msgstr "Arms"
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Account not connected. Please login first."
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#~ msgid "HP Bar"
-#~ msgstr "HP Bar"
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP Bar"
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP Bar"
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP Bar"
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
 
-#~ msgid "no"
-#~ msgstr "No"
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Friend"
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#~ msgid "Buddy List"
-#~ msgstr "Friend list"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Description: %s"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effect: %s"
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "New"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Job Level: %d"
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#~ msgid "Present: "
-#~ msgstr "Present: "
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr "Joined party."
 
-#~ msgid "Quit Guild"
-#~ msgstr "Quit Guild"
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s joined the party."
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
 
-#~ msgid "Recent:"
-#~ msgstr "Recent:"
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Accepting incoming trade requests."
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Cast Test Spell 1"
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoring incoming trade requests."
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Cast Test Spell 2"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Trading with %s"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Cast Test Spell 3"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Kick failed!"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 Handed Weapons"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Kick succeeded!"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Unequip@@"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Thanks for selling."
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equip@@"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Unable to sell."
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Drop@@"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Split@@"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Store@@"
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Strength %+d"
 
-#~ msgid "Select Server"
-#~ msgstr "Select Server"
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Agility %+d"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Failed to switch to "
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitality %+d"
 
-#~ msgid "windowed"
-#~ msgstr "windowed"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligence %+d"
 
-#~ msgid "fullscreen"
-#~ msgstr "fullscreen"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Dexterity %+d"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystery Skill"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Luck %+d"
 
-#~ msgid "Weapons"
-#~ msgstr "Weapons"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Crafts"
-#~ msgstr "Crafts"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "Stats"
-#~ msgstr "Stats"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Cost"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Attack:"
-#~ msgstr "Attack:"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflex:"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Remaining Status Points: %d"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "Disconnected from server!"
 
-#~ msgid "curl error "
-#~ msgstr "curl error "
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Luck"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Buddys"
-#~ msgstr "Buddys"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Party Window"
-#~ msgstr "Party Window"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Unarmed"
-#~ msgstr "Unarmed"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "Knife"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Sword"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Staff"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Whip"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Bow"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "Shooting"
-#~ msgstr "Shooting"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Mace"
-#~ msgstr "Mace"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Axe"
-#~ msgstr "Axe"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Craft"
-#~ msgstr "Craft"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s is not in your party!"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Unknown Skill"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " can't be created, but it doesn't exist! Exiting."
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "Couldn't set "
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid " video mode: "
-#~ msgstr " video mode: "
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connecting to character server..."
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "unnamed"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connecting to account server..."
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias of create"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Defense %+d"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Command: /new <party-name>"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "Unnamed"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Pick Up %s@@"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Unknown item"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll radius"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll laziness"
diff --git a/po/eo.po b/po/eo.po
index d428a011a..9fb2f6f37 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,2951 +1,4653 @@
-# Esperanto translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-09-10 13:30+0000\n"
-"Last-Translator: Yamiharu <yamiharu84@gmail.com>\n"
-"Language-Team: Esperanto <eo@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "--Helpo--"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr ""
 
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Tiu komando monstras la liston de uzeblaj komandoj"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "La mapo ne sxa"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
 msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Ĉu vi vere volas fini la programon?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Ĉu vi vere volas fini la programon?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2953,609 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "sennoma"
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "sennoma"
 
-#~ msgid "no"
-#~ msgstr "Ne"
diff --git a/po/es.po b/po/es.po
index 4077b9e44..e367da940 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,129 +1,131 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Nelson  <nelson6eeduardo65@gmail.com>, 2011.
-# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
 # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
+# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-17 18:06+0000\n"
+"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
-msgstr "Cargando jugadores"
+msgstr "Cargando personajes"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
-msgstr "Host de actualización inválido: %s"
+msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
-msgstr "¡Error creando la carpeta de actualizaciones!"
+msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, 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."
@@ -136,265 +138,266 @@ msgstr "Comando desconocido."
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta el nombre del gremio."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tám. caché:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con elservidor."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremio: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rango PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -408,7 +411,7 @@ msgstr "Precio: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -416,30 +419,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -448,19 +451,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -626,9 +629,9 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Borrar"
 
@@ -702,10 +705,10 @@ msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -713,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando mensaje privado para %s: %s"
@@ -731,15 +734,15 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignorar"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -837,7 +840,7 @@ msgstr "Grupo de destino:"
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
 msgid "Target Guild:"
-msgstr "Gremio objetivo:"
+msgstr "Diana de Guild:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
@@ -880,7 +883,7 @@ msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Cerrar"
 
@@ -896,19 +899,19 @@ msgstr "Siguiente >"
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -917,7 +920,7 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -946,31 +949,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -979,17 +982,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1039,91 +1042,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Restablecer estadísticas"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Restablecer cronometrador"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivel: %d de %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Queda: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidez de experiencia por %d minuto: %s"
 msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
 msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp de último monstruo eliminado:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tiempo antes de que jacko desove:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "¿%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "desove de jacko"
 
@@ -1143,7 +1146,7 @@ msgstr "Saltar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1168,43 +1171,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "barra de salud"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "barra de maná"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "barra de experiencia"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "barra de trabajo"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "barra de peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "barra de ranuras del inventario"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "barra de dinero"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "barra de estado"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Necesitas"
 
@@ -1221,11 +1224,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1263,327 +1266,328 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Fuera conjunto"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Desatender"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Borrar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Des-ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Sacar del gremio"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostrar artículos"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Desvestir"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr "Deformar"
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Cargar conjuntos antiguos"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Cargar hechizos antiguos"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nombre:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Bajar"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Guardar estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
@@ -1619,64 +1623,64 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -1723,7 +1727,7 @@ msgstr "Anuncio"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "Necesitas reiniciar el client si quieres descargar la musica"
+msgstr "Necesitas reiniciar el cliente si quieres descargar nueva música"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1788,34 +1792,38 @@ msgid "Tabs"
 msgstr "Pestañas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Mostrar nuevos susurros en pestañas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1866,22 +1874,17 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
-msgstr "Aprieta el botón para empezar a calibrar"
+msgstr "Presiona el botón para empezar la calibración"
 
 #: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
@@ -1923,308 +1926,368 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Misceláneos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Resaltar el alcanze de ataque de los monstruos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Apuntar a los monstruos en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minmapas extendidos"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En movimiento"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Corrección automatica de la posición"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronización de movimiento de jugador"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar barra de energía propia"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra / venta"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Otro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar los ataques colaterales de servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar el control de robot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar la proteción contra servidores defectuosos"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar los objetos escudos"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar fondo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relación"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Rendimiento"
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr "Mejor rendimiento (permite obtener un mejor rendimiento)"
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Ajustar rendimiento automáticamente"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desatendido"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia de criaturas"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleración de hardware"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Borrado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir intercambios"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar reducción de mapa (Software)"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensajes privados"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr "Mejor calidad (desabilitar para un mejor desmpeño)"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Viejo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Mostrar nuevos susurros en pestañas"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr "Habilitar re ordenamiento de sprites."
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar género"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr "Poca memoria (permite un uso más bajo de memoria)"
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr "Deshabilitar caché avanzado de criaturas (Software)"
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr "Deshabilitar caché de criaturas (Software)"
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Cuando se ignora a alguien:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar género"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nivel"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nombres Visibles"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Carácteres inseguros en los nombres"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nombres Visibles"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Mostrar dirección IP en la captura de pantalla"
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relación"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desatendido"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Borrado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir intercambios"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensajes privados"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Viejo"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "Relaciones"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Cuando se ignora a alguien:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Extenso (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Fuente japonesa"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
 
@@ -2276,137 +2339,117 @@ msgstr "medio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleración de hardware"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "en chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar caché de opacidad"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar reducción del mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limites alternativas FPS: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidad de interfaz"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalle de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -2435,7 +2478,8 @@ msgstr "Anunciar"
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en anuncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
@@ -2477,39 +2521,39 @@ msgstr "Nivel: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
-msgstr "gremio"
+msgstr "Clan"
 
 #: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr "Invita al jugador %s para su gremio %s."
+msgstr "Invita al jugador %s para su clan %s."
 
 #: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
-msgstr "Gremio %s pidiendo salir."
+msgstr "Clan %s pidiendo salir."
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
-msgstr "Miembro invitado al Gremio."
+msgstr "Miembro invitado al clan."
 
 #: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr "A quién te gustaría invitar al gremio %s?"
+msgstr "A quién te gustaría invitar al clan %s?"
 
 #: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "¿Dejar el Gremio?"
+msgstr "Salir del clan?"
 
 #: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "¿Estás seguro de que quieres dejar el gremio %s?"
+msgstr "Estás seguro de dejar el clan %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2555,15 +2599,15 @@ msgstr "Pandillas prioritarias"
 
 #: src/gui/socialwindow.cpp:872
 msgid "Attack mobs"
-msgstr "Pandillas para atacar"
+msgstr "Ataques de las pandillas"
 
 #: src/gui/socialwindow.cpp:907
 msgid "Ignore mobs"
-msgstr "Pandillas ignoradas"
+msgstr "Ignorar pandillas"
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
-msgstr "Crear Gremio"
+msgstr "Crear clan"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
@@ -2590,17 +2634,17 @@ msgstr "Cancelada la invitación de %s."
 #: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Aceptada la invitación al gremio de  %s."
+msgstr "Aceptada la invitación a la guild de  %s."
 
 #: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Rechazada la invitación al gremio de %s."
+msgstr "Cancelada la invitación a la guild de %s."
 
 #: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr "Creando gremio llamado %s."
+msgstr "Creando clan llamado %s."
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2609,24 +2653,24 @@ msgstr "Creando grupo llamado %s."
 
 #: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "Nombre del Gremio"
+msgstr "Nombre del clan"
 
 #: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "Escoja el nombre de su gremio."
+msgstr "Escoja el nombre de su clan."
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "Recibida petición de creación del gremio, pero ya existe."
+msgstr "Recibida petición de creación del clan, pero ya existe."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s te ha invitado al gremio %s."
+msgstr "%s te ha invitado al clan %s."
 
 #: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "Aceptar invitación al gremio"
+msgstr "Aceptar invitación al clan"
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
@@ -2671,502 +2715,502 @@ msgstr "Escoja el nombre del grupo."
 msgid "Specials"
 msgstr "Especiales"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) maniobra"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconoicido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) vista del mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Definir el modo operativo de la cámara"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Trabajo:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ningún objetivo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir fijar objetivo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Necesita fijar objetivo."
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia General"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia de Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Bélica"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia de Transmutación"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia de Naturaleza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comando"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "otro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Maná:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Ícono:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Guardar"
 
@@ -3203,55 +3247,54 @@ msgstr "Tú das:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "No tienes dinero suficiente."
+
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "No tienes dinero suficiente."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Completado"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
-msgstr "Personaje"
+msgstr "Ser"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
@@ -3299,7 +3342,7 @@ msgstr "Miembros del grupo"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr "Miembros del Gremio"
+msgstr "Miembros del guild"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3397,23 +3440,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3478,8 +3521,9 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Hacer al jugador <nick> operador del canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si el <nick> posee espacios, enciérrelo entre comillas dobles (\")."
+msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3501,7 +3545,7 @@ msgstr "Se necesita un usuario para ser operador!"
 
 #: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
-msgstr "¡Se necesita un usuario a expulsar!"
+msgstr "Se necesita un usuario a expulsar!"
 
 #: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
@@ -3517,6 +3561,10 @@ msgstr "Anuncio global de  %s:"
 msgid "%s whispers: %s"
 msgstr "%s envía mensaje privado: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora al jugador"
@@ -3552,9 +3600,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr "Este comando para de ignorar al jugador si había sido ignorado."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3648,11 +3695,11 @@ msgstr "Cambiar de Login"
 msgid "Choose World"
 msgstr "Escojer Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Mochila"
 
@@ -4047,68 +4094,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Ves "
 
@@ -4126,7 +4173,7 @@ msgstr "              usado para establecer parámetros personalizados."
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
-msgstr "              to the manaplus client."
+msgstr "              al cliente manaplus."
 
 #: src/main.cpp:52
 msgid "Options:"
@@ -4216,81 +4263,509 @@ msgstr "Gracias por comprar."
 msgid "Unable to buy."
 msgstr "Incapaz de comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Fuerza"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Fuerza:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agilidad:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalidad:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Inteligencia:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Suerte:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Imposible usar esta ID."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Error desconocido del char-server."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Error al crear personaje. Probablemente ya esté en uso."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Nombre equivocado."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Estadísticas incorrectas."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Cabello incorecto."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Ranura incorrecta."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Información"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Personaje Borrado."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Fallo al borrar el personaje."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Canales no son soportados!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Fuerza %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidad"
+#: src/net/ea/chathandler.cpp:136
+#, 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/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Jugador VIP."
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "Jugador MVP: "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidad %+.1f"
+msgid "Online users: %d"
+msgstr "Jugadores online: %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Juego"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Petición de salida denegada!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando hace que dejes el clan."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Para la ayuda."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un jugador a tu clan"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Deja el clan en la que estas"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Clan creado."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Ya estás en el gremio."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "La verificación de la guild no se effectuó."
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Respuesta del servidor desconocida."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Guild name: %s"
+msgstr "Nombre del gremio: %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidad"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Maestro del gremio: %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidad %+.1f"
+msgid "Guild level: %d"
+msgstr "Nivel en gremio: %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligencia"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Miembros conectados: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencia %+.1f"
+msgid "Max members: %d"
+msgstr "Máx. Miembros: %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Fuerza de voluntad"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Nivel promedio: %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Voluntad %+.1f"
+msgid "Guild exp: %d"
+msgstr "Experiencia del gremio: %d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Experiencia siguiente del gremio: %d"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Castillo del gremio: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "No se puede invitar jugadores al clan."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "El jugador cancel la invitacion a tu guild."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "El usuario es ahora de tu clan."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Tu clan está lleno."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Invitación desconocida a una guild."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "Has dejado el gremio."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s ha dejado tu gremio."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Usted fue expulsado del gremio."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s saco alguien de tu gremio."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invita un jugador a tu grupo"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Dejar el grupo en el que estás"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa a alguien del grupo en el que estás"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Mostrar/Cambiar el compartir experiencia en el grupo "
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Este comando hace que dejes el grupo."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <política>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Este comando cambia la política de compartición de artículos en el grupo."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<política> puede ser \"1\", \"yes\" y \"true\" para compartir artículos, o "
+"\"0\", \"no\" y \"false\" para no compartirlos."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Comando: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Este comando muestra la política actual de compartición de artículos del "
+"grupo."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <política>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+"Este comando cambia la política de compartición de experiencia del grupo."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o "
+"\"0\", \"no\" y \"false\" para no compartir."
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Comando: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Este comando muestra la política actual de compartición experiencia del "
+"grupo."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Compartir objetos habilitado."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Compartir objetos desabilitado."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "No es posible el compartir objetos."
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Compartir objetos desconocido."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Compartir experiencia activado."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Compartir experiencia desactivado ."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Imposible compartir experiencia."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Compartir experiencia desconocido."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Fallo al usar el objeto."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Imposible equipar."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Cuenta no encontrada. Por favor re-conéctate."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Contrasena antigua incorrecta."
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Nueva contrasena es muy corta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "ID no registrada."
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Contrasena incorrecta."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "La cuenta expiró."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Rechazado del servidor."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Cliente es demasiado antíguo."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Has sido baneado temporalmente del juego %s.\n"
+"Por favor contacta un GM de nuestro equipo via el foro."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Servidor sobrepoblado."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Este nombre de usuario ya está escogido."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Nombre de usuario borrado permanentemente."
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "No es posible crear un grupo."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo creado."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s se ha unido a tu grupo."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s ya es miembro de otro grupo."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s cancelo tu invitación."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ahora es un miembro de tu grupo."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ respuesta desconocida a la invitacion de %s."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Has dejado el grupo."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s dejó tu grupo."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Un miembro desconocido intentó decir: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Estás muerto"
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Ya no estás tan vivo..."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las manos frías de la muerte se están apoderando de tu alma."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fin Del Juego!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Inserta moneda para continuar."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4298,7 +4773,7 @@ msgstr ""
 "No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
 "mejor ."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4306,31 +4781,309 @@ msgstr ""
 "¡Parece que tu plan de romper las armas de tus enemigos con tu garganta "
 "falló!"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no fue muy bien."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "¿Quieres que tus posesiones sean identificadas?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te tiraron tu cabeza a tus manos."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Tu no estás muerto aún... sólo estás descansando."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Tu ya no existes más."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Parece que dejaste de existir."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Has expirado e ido a ver al tu creador."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Eres un cadáver."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Sin vida, descansa en paz."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Si no estuvieras tan animado, diría que estás muerto."
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Tus procesos metabólicos son ya historia."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Estás fuera de tus botas."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Te han echado a patadas."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
+"de los invisibles."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Eres un ex-jugador."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Estas avanzando... hacia el barranco."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Mensaje"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Has cogido %s."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Has gastado %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "¡Imposible incrementar!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Equipar las flechas primero."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "¡Fallo al intercambiar!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "¡Fallo al hacer un emoticono!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "¡Fallo al sentarse!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "¡Fallo al crear un chat!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "¡No se puede unir al grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "¡Imposible gritar!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "PV insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "No tienes ninguna nota armenzada!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "No puedes hacer esto ahora mismo!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que necesitas más dinero... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Necesitas otra Gema Roja!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Necesitas otra Gema Azul!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Llevas muchas cosas para hacer esto!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Huh? Qué es eso?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Fallo al teletransportar..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "No puedes robar nada..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Veneno no tuvo ningún efecto..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quiere comerciar contigo, aceptas?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Intercambio es imposible. El otro personaje está muy alejado."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Intercambio imposible. El personaje no existe."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Intercambio cancelado por una razón desconocida."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Intercambio: Tú y %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Intercambio con %s cancelado."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Intercambio no soportado."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Fallo al anadir objeto por una razón desconocida."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Intercambio Cancelado."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Intercambio Realizado."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Fuerza"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Fuerza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidad"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidad %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidad"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidad %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligencia"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Inteligencia %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Fuerza de voluntad"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Voluntad %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Pulsa OK para reaparecer."
@@ -4386,16 +5139,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Número de ranura equivocado."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Información"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personaje eliminado."
@@ -4459,13 +5202,9 @@ msgstr "%s expulsó a %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconocido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Gremio creado."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr "Error al crear el gremio."
+msgstr "Error al crear el clan."
 
 #: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
@@ -4495,10 +5234,6 @@ msgstr "Cuenta Baneada."
 msgid "New password incorrect."
 msgstr "Nueva contraseña incorrecta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Contrasena antigua incorrecta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Cuenta no conectada. Por favor conéctate primero."
@@ -4519,8 +5254,8 @@ msgstr "El nuevo e-mail ya existe."
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
-"El registro no está soportado. Por favor contacta un administrador del "
-"server."
+"El registro desde el cliente no está soportado. Por favor contacta con la "
+"administración del servidor."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
@@ -4576,24 +5311,11 @@ msgstr "Aceptar propuestas de intercambio entrantes."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorar las propuestas de intercambio entrantes."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quiere comerciar contigo, aceptas?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Intercambiando con %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Intercambio Cancelado."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Intercambio Realizado."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Error al expulsar!"
@@ -4784,5 +5506,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Objeto desconocido"
-
-
diff --git a/po/et.po b/po/et.po
index 977b23756..d4f497e86 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,2955 +1,4653 @@
-# Estonian translation for mana
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-26 08:47+0000\n"
-"Last-Translator: Kerdo <Unknown>\n"
-"Language-Team: Estonian <et@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
+msgstr "Mees"
+
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
+msgstr "Naine"
+
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
-msgstr ""
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
+msgstr "Kustuta"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
+msgstr "Vestlus"
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr ""
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
+msgstr "Jah"
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr ""
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
+msgstr "Ei"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Mees"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Naine"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
-msgstr "Kustuta"
-
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
-msgid "Choose"
-msgstr "Sulge"
-
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
-msgstr "Vestlus"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Jah"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Ei"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nimi: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Raha: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Sulge"
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "Abi"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "Sulge"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
-msgstr "Järgmine"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Järgmine"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
+msgstr "Järgmine"
+
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Ei"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Raha: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Kustuta"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
-
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2957,612 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "Previous"
-#~ msgstr "Eelmine"
 
-#~ msgid "New"
-#~ msgstr "Uus"
diff --git a/po/fa.po b/po/fa.po
index c85fa4853..7ebe1b6cb 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,2968 +1,4645 @@
-# Persian translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-07-24 18:21+0000\n"
-"Last-Translator: kasra5004 <kasra5004@yahoo.com>\n"
-"Language-Team: Persian <fa@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "در حال اتصال..."
+msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "گذرواژه:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "ثبت نام نشده"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "رهنما"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "صفحه ی راهنما را نشان می دهد"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "نام نقشه ی حاضر را نشان می دهد"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "تعداد افراد آنلاین را نشان می دهد"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "با این فرمان می توانید به سایرین چیزی در مورد خودتان بگویید"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "صفحه را پاک می کند"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "می توانید با این فرمان پیغام خصوصی بفرستید"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"با این دستور می توانید یک شاخه برای پیغام های خصوصی  کاربری دیگر ، درست کنید"
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "تمامی کانال های عمومی را نشان می دهد"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "با این دستور می توانید به یک کانال بپیوندید یا یکی درست کنید"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "می توانید به وسیله ی آن از چت خود، یک کپی خروجی بگیرید"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "اعلام سراسری( تنها مسئولان بازی می توانند از آن استفاده کنند.)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "برای اطلاعات بیشتر ،  <دستور مورد نظر> help/   را تایپ کنید"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr ""
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
+msgstr "چنین دستور وجود ندارد"
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
+msgstr "کلی"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr ""
+#: src/game.cpp:537
+msgid "Network Error"
+msgstr "خطای شبکه"
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/game.cpp:1577
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/beingpopup.cpp:118
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:145
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "کلی"
-
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
-msgstr "خطای شبکه"
-
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "خروج"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "حداکثر"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "انصراف"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "تغییر گذرواژه"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "نام"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "رنگ مو"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "مدل مو"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "بساز"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "مرد"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "زن"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "تایید می کنم که خواهان حذف این شخصیت هستم"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "ثبت نام نشده"
 
-#: src/gui/charselectdialog.cpp:150
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "چت"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "بلی"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#: src/gui/debugwindow.cpp:166
 #, c-format
-msgid "Map: %s"
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Minimap: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:176
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Particle detail: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Ambient FX: %s"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "تایید"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "تجهیزات"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "تایید"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
-msgstr "بعدی"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "بعدی"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
+msgstr "بعدی"
+
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "در حال اتصال..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "بساز"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "صفحه ی راهنما را نشان می دهد"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "نام"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "حذف"
-
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
-#, c-format
-msgid "% Accuracy"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, c-format
-msgid "% Evade"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Critical"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
-
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "چنین دستور وجود ندارد"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "ثبت نام نشده"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "تغییر گذرواژه"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2970,622 +4647,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "no"
-#~ msgstr "خير"
-
-#~ msgid "Buddy"
-#~ msgstr "دوست"
-
-#~ msgid "Buddy List"
-#~ msgstr "فهرست دوستان"
-
-#~ msgid "Previous"
-#~ msgstr "قبلی"
 
-#~ msgid "New"
-#~ msgstr "جدید"
diff --git a/po/fi.po b/po/fi.po
index 40923cdc2..fd66fa93a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,126 +1,127 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, 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."
@@ -133,161 +134,161 @@ msgstr "Tuntematon komento."
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
-" käytit omaa nimeäsi."
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
+"käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -295,105 +296,105 @@ msgstr "Orvot resurssikuvat:"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
-" \"true\", \"false\", \"1\" tai \"0\"."
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP-taso: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bottitutka"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Liiku"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Tulos"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Osta"
 
@@ -407,7 +408,7 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -415,30 +416,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -447,19 +448,19 @@ msgstr "Myy"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Peru"
 
@@ -625,9 +626,9 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Poista"
 
@@ -701,10 +702,10 @@ msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -712,12 +713,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -730,15 +731,15 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ohita"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Kartta"
 
@@ -879,7 +880,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sulje"
 
@@ -895,19 +896,19 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -916,7 +917,7 @@ msgid "Help"
 msgstr "Apua"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Tavarat"
 
@@ -945,31 +946,31 @@ msgid "id"
 msgstr "#"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -978,17 +979,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1038,91 +1039,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Nollaa tiedot"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Nollaa ajastin"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1142,7 +1143,7 @@ msgstr "Ohita"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Palvelin:"
@@ -1167,43 +1168,43 @@ msgstr "Rekisteröidy"
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "terveyspalkki"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "manapalkki"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "kokemuspalkki"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "työpalkki"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "painopalkki"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "tavarapaikkapalkki"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "rahapalkki"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "nuolipalkki"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "tilapalkki"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Tarvitaan"
 
@@ -1220,11 +1221,11 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1262,327 +1263,328 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ystävysty"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Vaimenna"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Pyyhi"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seuraa"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Matki"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Riisu"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Nosta"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Lataa vanhat asut"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Lataa vanhat loitsut"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Siirrä alas"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Tallenna tila"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
@@ -1618,64 +1620,64 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Muu palvelin"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -1723,8 +1725,8 @@ msgstr "Huomaa"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
-" musiikit"
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
+"musiikit"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1787,34 +1789,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Laita kaikki kuiskaukset välilehtiin"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1865,19 +1871,14 @@ msgstr "Sininen:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1922,308 +1923,368 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Hirviöt"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Piirrä polku"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Näytä työ"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Näytä tausta"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relaatio"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutraali"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Ystävä"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Vaimennettu"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Huomiotta jätetty"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Rautakiihdytys"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Pyyhitty"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Salli kaupakäynti"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Salli kuiskaukset"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Vanha"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Laita kaikki kuiskaukset välilehtiin"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Näytä sukupuoli"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Kun jätät huomiotta:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Näytä taso"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Näytä nimet"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Näytä nimet"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relaatio"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutraali"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Ystävä"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Vaimennettu"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Huomiotta jätetty"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Pyyhitty"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Salli kaupakäynti"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Salli kuiskaukset"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Vanha"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Kun jätät huomiotta:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Kookas (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Suuri (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Jättimäinen (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -2275,136 +2336,115 @@ msgstr "keskitaso"
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Rautakiihdytys"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "leijuvana"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
+msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
@@ -2433,7 +2473,8 @@ msgstr "Ilmoita"
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
@@ -2475,7 +2516,7 @@ msgstr "Taso: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Kilta"
 
@@ -2507,7 +2548,7 @@ msgstr "Eroa killasta?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Ryhmä"
 
@@ -2669,502 +2710,502 @@ msgstr "Anna ryhmällesi nimi."
 msgid "Specials"
 msgstr "Erikoisuudet"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) liiku"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, nosta"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni nosto 1x1 ruutua"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletusnosto 2x1 ruutua"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) nosto edestä 2x3 ruutua"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) nosto 3x3 ruutua"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja nosta etäisyydellä 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja nosta etäisyydellä 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja nosta maksimietäisyydellä"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) nosta"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) karttanäkymä"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) suunnittelukamera"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "VP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Kok:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Työ:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ei kohdetta"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Salli kohde"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Tarvitsee kohteen"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Yleismagia"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Elämämagia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Sotamagia"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Muovausmagia"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Luontomagia"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Astraalimagia"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Komentomuokkain"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "muu"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Symboli:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Komento:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3201,47 +3242,46 @@ msgstr "Annat:"
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Valmis"
 
@@ -3393,23 +3433,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3474,6 +3514,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
@@ -3513,6 +3554,10 @@ msgstr "%s ilmoittaa kaikille:"
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Muokkaa"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Jätä pelaaja huomiotta"
@@ -3548,8 +3593,7 @@ msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
@@ -3645,11 +3689,11 @@ msgstr "Vaihda kirjautumistietoja"
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Varasto"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Kärry"
 
@@ -4044,68 +4088,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Näet "
 
@@ -4214,81 +4258,503 @@ msgstr "Kiitos kaupoista."
 msgid "Unable to buy."
 msgstr "Ostaminen epäonnistui."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Voima"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Voima:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Ketteryys:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Elinvoima:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Älykkyys:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Näppäryys:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Tuuri:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Tätä tunnistetta ei voi käyttää."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Tuntematon hahmopalvelinvirhe."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Väärä nimi."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Väärät arvot."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Väärä hiustyyli."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Väärä paikka."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Tietoja"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Hahmo poistettu."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Hahmon poisto epäonnistui."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Kanavia ei tueta!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Voima %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Ketteryys"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "MVP-pelaaja."
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "MVP-pelaaja: "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Ketteryys %+.1f"
+msgid "Online users: %d"
+msgstr "Käyttäjiä palvelimella: %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Näppäryys"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Peli"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Lopetuspyyntö evätty!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Komento: /invite <nimi>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Komento: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Tämä komento saa sinut eroamaan killasta."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Näytä tämä ohje."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Kutsu pelaaja kiltaasi"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Eroa nykyisestä killastasi"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Poista käyttäjä killastasi"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Kilta luotu."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Olet jo killassa."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "Emperium-tarkistus epäonnistui."
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Tuntematon palvelimen vastaus."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Näppäryys %+.1f"
+msgid "Guild name: %s"
+msgstr "Killan nimi: %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Elinvoima"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Kiltamestari: %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Elinvoima %+.1f"
+msgid "Guild level: %d"
+msgstr "Kiltataso: %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Älykkyys"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Jäseniä linjoilla: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Älykkyys %+.1f"
+msgid "Max members: %d"
+msgstr "Jäsenmaksimi: %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Tahdonvoima"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Keskim. taso: %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Tahdonvoima %+.1f"
+msgid "Guild exp: %d"
+msgstr "Kiltakokemusta: %d kkp"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Seuraavaan tasoon: %d kkp"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Killan linna: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "Käyttäjä liittyi kiltaasi."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Kiltasi on täynnä."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Tuntematon vastaus kiltakutsuun."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "Olet eronnut killasta."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s on eronnut killastasi."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Sinut on potkittu killasta."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s on potkittu ulos killastasi."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Kutsu pelaaja ryhmääsi"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Eroa nykyisestä ryhmästäsi"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Potki pelaaja ryhmästäsi"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Näytä/muuta ryhmän tavaranjaon asetuksia"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Tämä komento erottaa pelaajan ryhmästä."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Komento: /item <jakopolitiikka>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Tämä komento muuttaa ryhmän saaliinjakopolitiikkaa."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"saalis jaetaan, tai \"0\", \"no\" tai \"false\", jolloin saalista ei jaeta."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Komento: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr "Tämä komento näyttää ryhmän nykyisen saaliinjakopolitiikan."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Komento: /exp <jakopolitiikka>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin "
+"kokemuspisteitä ei jaeta."
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Komento: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Saaliinjako käytössä."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Saaliinjako poistettu käytöstä."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Saaliinjako ei ole mahdollista."
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Saaliinjaon tila on tuntematon."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Kokemuksen jako käytössä."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Kokemuksen jako pois käytöstä."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Kokemuksen jako ei ole mahdollista."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Kokemuksen jaon tila on tuntematon."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Tavaran käyttö ei onnistunut."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Käyttöönotto ei onnistunut."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Vanha salsana on väärä."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Uusi salasana on liian lyhyt."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "Rekisteröimätön tunniste."
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Väärä salasana."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "Tili vanhentunut."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
+
+#: src/net/ea/loginhandler.cpp:217
+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."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Liian vanha asiakasohjelma."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Palvelin on täynnä."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Käyttäjätunnus on jo käytössä."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Käyttäjänimi pysyvästi poistettu."
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Ryhmän luonti epäonnistui."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Ryhmä luotu."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s on liittynyt ryhmääsi."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s kuuluu jo johonkin ryhmään."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s ei ottanut kutsuasi vastaan."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s on nyt ryhmäsi jäsen."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Erosit ryhmästä."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s on eronnut ryhmästä."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Tuntematon jäsen yritti sanoa: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Olet kuollut."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Et ole enää erityisen elossa."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Tuonelasta käy sieluusi kylmä viima."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Se siitä!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Syötä kolikko jatkaaksesi."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4296,7 +4762,7 @@ msgstr ""
 "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
 "paikkaan."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4304,31 +4770,309 @@ msgstr ""
 "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
 "epäonnistui."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ei tainnut mennä kovin lujaa."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Pim! Olet annihiloitu."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Jäi näköjään oma pää vetävän käteen."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Et ole kuollut vielä, lepäät vain."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Olet lakannut olemasta."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Olet lähtenyt moikkaamaan luojaasi."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Raato mikä raato."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Olet eloton, mutta lepäät rauhassa."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa."
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Aineenvaihduntaprosessisi ovat historiaa."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Olet lopultakin nakkisuojassa."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Potkaisit tyhjää."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan "
+"jokeen."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Olet entinen pelaaja."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Kaipaat kotivuonoille."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Viesti"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "%s nostettu."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Käytit %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Taidon korottaminen epäonnistui!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Varusta ensin nuolia."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Kauppa epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Elehtiminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Istuminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Keskustelun luonti epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Ryhmään liittyminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Huutaminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Et ole vielä riittävän korkealla tasolla!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Voimapisteesi eivät riitä!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Manapisteesi eivät riitä!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Sinulla ei ole muistioita (memo)."
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Et voi tehdä tätä juuri nyt."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Näyttää siltä että tarvitset lisää rahaa."
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Tarvitset toisen punaisen helmen."
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Tarvitset toisen sinisen helmen."
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Kannat liian paljon tehdäksesi tällaista!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Siis mikä?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Siirtymä (warp) epäonnistui..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Varastaminen ei onnistunut..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Myrkyllä ei ollut vaikutusta..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Kauppa: sinä ja %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Käsittelemätön kaupan peruutus -paketti."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Kaupat peruttu."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Kaupat tuli."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Voima"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Voima %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Ketteryys"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Ketteryys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Näppäryys"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Näppäryys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Elinvoima"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Elinvoima %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Älykkyys"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Älykkyys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Tahdonvoima"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Tahdonvoima %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Paina OK syntyäksesi uudelleen."
@@ -4382,16 +5126,6 @@ msgstr "Ainakin yksi arvo on sallitun alueen (%u - %u) ulkopuolella."
 msgid "Invalid slot number."
 msgstr "Paikan numero ei kelpaa."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Tietoja"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Hahmo poistettu."
@@ -4455,10 +5189,6 @@ msgstr "%s potkaisi käyttäjän %s ulos."
 msgid "Unknown channel event."
 msgstr "Tuntematon kanavatapahtuma."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Kilta luotu."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Killan luonti epäonnistui."
@@ -4491,10 +5221,6 @@ msgstr "Tili porttikiellossa."
 msgid "New password incorrect."
 msgstr "Uusi salasana on väärä."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Vanha salsana on väärä."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
@@ -4574,24 +5300,11 @@ msgstr "Hyväksyt tulevat kaupantekoehdotukset."
 msgid "Ignoring incoming trade requests."
 msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Kaupantekoa pelaajan %s kanssa"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Kaupat peruttu."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Kaupat tuli."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Potkiminen epäonnistui!"
@@ -4782,5 +5495,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
-
-
diff --git a/po/fr.po b/po/fr.po
index 746948d6e..4727011b8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <antoinebcn@hotmail.com>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
 # Bernard  <nard@bh28.net>, 2011.
@@ -10,119 +10,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -136,267 +138,268 @@ msgstr "Commande inconnue."
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
-"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
+"\". Soit elle existe déjà, soit il s'agit de vous même."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rang PvP : %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Testeur de Robot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Déplacement"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Résultat"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Acheter"
 
@@ -410,7 +413,7 @@ msgstr "Prix : %s / Total : %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -418,30 +421,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -450,19 +453,19 @@ msgstr "Vendre"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -628,9 +631,9 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -704,10 +707,10 @@ msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -715,12 +718,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -733,15 +736,15 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignorer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Carte"
 
@@ -882,7 +885,7 @@ msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fermer"
 
@@ -898,19 +901,19 @@ msgstr "Suivant >"
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -919,7 +922,7 @@ msgid "Help"
 msgstr "Aide"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -948,31 +951,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -981,17 +984,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1041,91 +1044,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiques"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "RaZ stats"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "RaZ temps"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Niveau : %d à %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp : %d/%d Reste : %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidité exp pour %d min : %s"
 msgstr[1] "Rapidité exp pour %d min : %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Temps pour le prochain niveau %d min : %s"
 msgstr[1] "Temps pour le prochain niveau %d min : %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Temps avant l'arrivée de Jack0 :"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
@@ -1145,7 +1148,7 @@ msgstr "Sauter"
 msgid "Login"
 msgstr "Compte"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serveur :"
@@ -1170,43 +1173,43 @@ msgstr "S'inscrire"
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barre de vie"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barre de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barre d'expérience"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barre de compétences"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barre de poids"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barre emplacements d'inventaire"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barre d'argent"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barre de flèches"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barre de Statut"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Restant"
 
@@ -1223,11 +1226,11 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1265,327 +1268,328 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Être ami"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Éviter"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Éliminer"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Suivre"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imiter"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Montrer les objets"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Déshabiller"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Charger les anciennes tenues"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Charger les anciens sorts"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "N'enlève pas le nom"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Aller vers le bas"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Sauvegarder l'état"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Changer de serveur"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Changer de personnage"
 
@@ -1621,64 +1625,64 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisissez votre serveur  *** Mode Sûr ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -1789,34 +1793,38 @@ msgid "Tabs"
 msgstr "Fenêtre"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Placer tous les messages privés dans des onglets"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Activer la boite de dialogue d'échanges"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Temps"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
@@ -1867,19 +1875,14 @@ msgstr "Bleu : "
 msgid "Alpha:"
 msgstr "Opacité : "
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Éditer"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -1924,308 +1927,368 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Entourer les monstres visés"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En mouvement"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de fou"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Entourer les joueurs visés"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Afficher les compétences"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Autre"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Activer la protection contre les serveurs instables"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Montrer le fond"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relation"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutre"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Ami"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Ajustement automatique des performances"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Négligé"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Montrer les êtres en transparence"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignoré"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Accélération matériel"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Effacé"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Autoriser les échanges"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Autoriser les messages privés"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Ancien"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Placer tous les messages privés dans des onglets"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Afficher le genre"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quand ignoré :"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Afficher le genre"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Afficher le niveau"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Afficher les noms"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Afficher les noms"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Montrer les Status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relation"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutre"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Ami"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Négligé"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignoré"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Effacé"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Autoriser les échanges"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Autoriser les messages privés"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Ancien"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quand ignoré :"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Petite (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Grande (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grand (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Immense (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2277,142 +2340,122 @@ msgstr "moyen"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Accélération matériel"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "dans la conversation"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Activer le cache transparence"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Authoriser la réduction des cartes"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -2441,7 +2484,8 @@ msgstr "Annoncer"
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
@@ -2483,7 +2527,7 @@ msgstr "Niveau : %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilde"
 
@@ -2515,7 +2559,7 @@ msgstr "Quitter la guilde ?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groupe"
 
@@ -2624,8 +2668,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
-" dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
+"dans une."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -2681,502 +2725,502 @@ msgstr "Choisissez le nom du groupe."
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Mouvements un peu fous"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Mouvement complètement fous"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) Mouvements"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) Mouvements fous personnalisés"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Mouvements fous"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Carte"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Définir le mode camera"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "PM :"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Compétences :"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Pas de cible"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Autoriser le ciblage"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Nécessite une cible"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magie générale"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magie de Vie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magie de Guerre"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magie de Transmutation"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magie de la Nature"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magie Astrale"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Éditeur de commande"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Magie"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Autre"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Symbole : "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana : "
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3213,49 +3257,48 @@ msgstr "Vous donnez :"
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Vous n'avez pas assez d'argent."
+
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Vous n'avez pas assez d'argent."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Terminé"
 
@@ -3407,23 +3450,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3457,8 +3500,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3491,6 +3533,7 @@ msgstr ""
 "Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nom du personnage> contient des espaces, entourez le de guillemets "
@@ -3532,6 +3575,10 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Éditer"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignore l'autre joueur"
@@ -3567,10 +3614,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3664,11 +3709,11 @@ msgstr "Changer de Compte"
 msgid "Choose World"
 msgstr "Choix du monde"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Entrepôt"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Sac"
 
@@ -3928,7 +3973,7 @@ msgstr "Onglet de conversation suivant"
 
 #: src/keyboardconfig.cpp:278
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Fermer la fenêtre de dialogue ouverte"
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4063,68 +4108,68 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4217,8 +4262,7 @@ msgstr ""
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
@@ -4240,83 +4284,512 @@ msgstr "Merci de votre achat."
 msgid "Unable to buy."
 msgstr "Incapable d'acheter."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Force"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Force :"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agilité :"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalité :"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Intelligence :"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Dextérité :"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Volonté :"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Vous ne pouvez utiliser cette identification."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Erreur inconnue du serveur de personnage."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Mauvais nom."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Stats incorrectes."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Cheveux incorrects."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Case incorrecte."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informations"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Personnage supprimé."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "La suppression du personnage n'a pu s'effectuer."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Les salons ne sont pas gérés !"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Force %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilité"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Joueur MVP"
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "MVP joueur :"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilité %+.1f"
+msgid "Online users: %d"
+msgstr "Joueurs en ligne : %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Dextérité"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Jeu"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Requête de départ refusée !"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nom du personnage>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commande : /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande vous fait quitter la guilde actuelle."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Affiche cette aide."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitter la guilde courante"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilde créée."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Vous faîtes déjà membre d'une guilde."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "Erreur dans la création de la guilde."
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Réponse inconnue du serveur."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Dextérité %+.1f"
+msgid "Guild name: %s"
+msgstr "Nom de la guilde : %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalité"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Maître de la guilde : %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalité %+.1f"
+msgid "Guild level: %d"
+msgstr "Niveau de la guilde : %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligence"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Membres en ligne : %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligence %+.1f"
+msgid "Max members: %d"
+msgstr "Membres maximums : %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Volonté"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Niveau moyen : %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Volonté %+.1f"
+msgid "Guild exp: %d"
+msgstr "Expérience Groupe : %d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Expérience suivante pour la guilde : %d"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Château de la guilde : %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "N'a pas pu inviter le joueur dans la guilde. "
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "Le joueur a refusé l'invitation dans la guilde."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "%s est maintenant membre de la guilde."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Votre guilde est complète."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Réponse d'invitation à la guilde inconnue."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "vous avez quitté la guilde."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s a quitté votre guilde."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Vous avez été renvoyé de la guilde."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s a sorti quelqu'un de votre guilde."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Cette commande vous fait quitter votre groupe actuel."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Commande : /item <policy>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Cette commande change les préférences d'échange d'objet du groupe."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
+"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Commande : /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'objet."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Commande : /exp <policy>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+"Cette commande change les préférences du groupe sur le partage d'expérience."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
+"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Commande : /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'expérience."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Partage d'objet activé."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Partage d'objet désactivé."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Partage d'objet impossible."
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Paramètre de partage d'objets inconnu."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Partage d'expérience autorisé."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Partage d'expérience non autorisé."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Partage d'expérience impossible."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Paramètre de partage d'expérience inconnu."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Impossible d'utiliser l'objet."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Impossible d'équiper cet objet."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Ancien mot de passe incorrect."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Le nouveau mot de passe est trop court."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erreur inconnue."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "Id non enregistrée."
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Mauvais mot de passe."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "Le compte a expiré."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Rejeté par le serveur."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
+"contact avec l'équipe des GM."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Client trop ancien."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Vous avez temporairement été banni du jeu jusqu'au %s.\n"
+"Merci de vous mettre en contact avec l'équipe des GM sur le forum."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Serveur surpeuplé."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Ce nom d'utilisateur est déjà utilisé."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Le groupe n'a pu être créé."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Création du groupe réussie."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s a rejoint votre groupe."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s est déjà membre du groupe."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s a refusé votre invitation."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s est maintenant membre de votre groupe."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ Erreur inconnue sur l'invitation de %s."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Vous avez quitté le groupe."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s a quitté le groupe."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Un membre inconnu a essayé de dire : %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Nous avons le regret de vous informer que votre personnage est mort sur le "
 "champ de bataille."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer ton âme."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fin de la partie !"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Introduire une pièce pour continuer"
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4324,7 +4797,7 @@ msgstr ""
 "Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... "
 "il... est parti dans un monde meilleur."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4332,33 +4805,320 @@ msgstr ""
 "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
 "gorge a échoué."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
 "autre."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Vous n'existez plus."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Vous avez cessez d'exister."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Tu es fini. Tu es parti retrouver ton créateur."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Tu es un dur."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Privé de toute essence de vie, tu reposes en paix."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"Si tu n'étais pas autant en forme, tu serais en train de manger les "
+"pissenlits par la racine."
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Vos processus métaboliques appartiennent au passé maintenant."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Tu es en dehors des clous"
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Tu viens de toucher le fond."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
+"l'armée de l'ombre."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Tu reposes au fond de l'eau."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Message"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre "
+"santé."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Vous avez ramassé  %s."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Vous avez dépensé %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Ne peut pas augmenter la capacité !"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Équiper d'abord les flèches!"
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Échec de la transaction !"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Émoticône non réalisée !"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Vous n'avez pas pu vous asseoir !"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Vous n'avez pas pu créer la conversation !"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Vous n'avez pas pu rejoindre le groupe !"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Vous ne pouvez pas crier !"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Vous n'avez pas atteint un niveau suffisant !"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Pas assez de vie !"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "PV insuffisant !"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Vous n'avez pas de messages !"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Vous ne pouvez faire cela maintenant !"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Vous portez trop de choses pour pouvoir faire cela !"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Hé ? Qu'est-ce donc que cela ?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Enchainement échoué..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Vous n'avez rien pu voler..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Le poison fut sans effet..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Échange impossible. Ce personnage n'existe pas."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Échange annulé pour une raison inconnue."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Échange : Vous et %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Échange avec %s annulé."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Échange non pris en compte."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
+"surchargé."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
+"de place libre."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Impossible de rajouter un objet pour une raison inconnue."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Échange annulé."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Échange finalisé."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Force"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Force %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilité"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Dextérité"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Dextérité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalité"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligence %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Volonté"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Volonté %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Cliquez OK pour revivre"
@@ -4414,16 +5174,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Numéro de case invalide."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erreur inconnue."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informations"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Joueur effacé."
@@ -4487,10 +5237,6 @@ msgstr "%s a renvoyé %s."
 msgid "Unknown channel event."
 msgstr "Événement inconnu dans le canal."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilde créée."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erreur lors de la création de la guilde."
@@ -4523,10 +5269,6 @@ msgstr "Compte banni."
 msgid "New password incorrect."
 msgstr "Nouveau mot de passe incorrect."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
@@ -4608,24 +5350,11 @@ msgstr "Accepter les demandes d'échanges."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer les demandes d'échanges."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Échange avec %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Échange annulé."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Échange finalisé."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Impossible de sortir la personne !"
@@ -4816,5 +5545,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Objet inconnu"
-
-
diff --git a/po/he.po b/po/he.po
index 9d671e827..d70f59769 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,3973 +1,5460 @@
-# Hebrew translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-09 11:27+0000\n"
-"Last-Translator: hewhohasalongname <Unknown>\n"
-"Language-Team: Hebrew <he@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "מתחבר לשרת המפה..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "התחברות"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "בחר שחקן"
+msgstr ""
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "מתחבר לשרת המפה..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr ""
+
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "סיסמה:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "שנה"
+msgstr ""
 
-#: src/client.cpp:863
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "החבר קודם בהצלחה."
+msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "בטל רישום"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "שרת עדכון פגום: "
+msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "פקודה לא מוכרת."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- עזרה --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "הצג תפריט עזרה זה <help/"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "הצג את שם המפה <where/"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "הצג את כמות המשתמשים המחוברים <who/"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "ספר על עצמך <me/"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "נקה את החלון <clear/"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "שלח הודעה פרטית למשתמש < msg/"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "נמען ההודעה < whisper/"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "לא ניתן לשלוח לחישות ריקות!"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "נמען ההודעה  <w/"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr ""
+"לא ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת או שמדובר "
+"בך."
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > יוצר לשונית עבור הודעות פרטיות עם משתמש אחר"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "מבקש להצטרף לחדר %s."
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > שם נוסף ל-query"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr "שם חבורה חסר."
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > הצג את כל החדרים הציבוריים"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > צור או הצטרף לחדר"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > צור חבורה חדשה"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party > הזמן משתמש לחבורה"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > התחל להקליט את השיחה לקובץ חיצוני"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > קובע אם <אנטר> סוגר את תיבת הטקסט של הצ'אט"
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > קבל את רשימת הנמצאים (ישלח לרישום, אם פעיל)"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > הודעה גלובאלית (GM בלבד)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "למידע נוסף, הקלד /help <command>."
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "פקודה: /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "פקודה זו מציגה רשימה של כל הפקודות האפשריות."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "פקודה: /help <command>"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
+msgstr "סגירת תיבת הטקסט האוטומטית."
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "פקודה זו מציגה עזרה על <command>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr "ההודעה סוגרת את תיבת הטקסט."
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "פקודה: /announce <msg>"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
+msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** זמין ל-GM בלבד ***"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
+msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
-"This command sends the message <msg> to all players currently online.\r\n"
-"פקודה זו שולחת את ההודעה <msg> לכל השחקנים המחוברים."
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "פקודה: /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "פקודה זו מנקה את רישום השיחה הקודמת."
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "פקודה: /item <policy>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "פקודה: /join <channel>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "פקודה זו מכניסה אותך אל <channel>."
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "אם <channel> אינו קיים, הוא נוצר."
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "פקודה: /list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "פקודה זו מציגה את רשימת כל החדרים."
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "פקודה: /me <message>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "פקודה זו תאמר לאחרים שאתה (עושה) <msg>."
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "פקודה: /msg <nick> <message>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "פקודה: /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "פקודה: /w <nick> <message>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "פקודה זו שולחת את הטקסט <message> אל <nick>."
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "אם <nick> מכיל רווחים בתוכו, תחום אותו במרכאות כפולות (\")."
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "פקודה: /query <nick>"
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "פקודה: /q <nick>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "הפקודה מנסה ליצור לשונית עבור מסרים בינך לבין <nick>."
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "פקודה: /create <party-name>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "פקודות אלה יוצרות חבורה בשם <party-name>."
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "פקודה: /party <nick>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "פקודה זו מזמינה את <nick> להיות בחבורתך."
-
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "פקודה: /present"
-
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
-"פקודה זו מקבלת את רשימת המשתמשים המופיעים על המסך, ושולח אותה לרישום, אם "
-"הינך מקליט רישום, או אל השיחה."
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "פקודה: /record <filename>"
-
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
-
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "פקודה: /record"
-
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "פקודה זו מסיימת תהליך הקלטה."
-
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "פקודה: /toggle <state>"
-
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
-"הפקודה קובעת אם מקש האנטר יסגור את תיבת הטקסט של הצ'אט או שהוא ייסגר באופן "
-"אוטומטי."
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
-"<state> יכול להיות אחד משני משני מצבים. \"1\", \"yes\", \"ture\" כדי לשנות "
-"למצב פעיל, או \"0\", no\", falst\" כדי לשנות למצב כבוי."
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "פקודה: /toggle"
-
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "הפקודה מציגה את מצב סגירת הטקסט האוטומטית."
-
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "פקודה: /item <policy>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "פקודה: /where"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "פקודה זו מציגה את שם המפה הנוכחית."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "פקודה: /who"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
+msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "הקלד /help לרשימת הפקודות."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "לא ניתן לשלוח לחישות ריקות!"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Client uptime: %s"
 msgstr ""
-"לא ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת או שמדובר "
-"בך."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:970
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "מבקש להצטרף לחדר %s."
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "שם חבורה חסר."
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr "סגירת תיבת הטקסט האוטומטית."
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "ההודעה סוגרת את תיבת הטקסט."
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "חבורה נוצרה בהצלחה."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
+msgstr ""
 
-#: src/commandhandler.cpp:486
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
+msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
+msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "תמונת־מסך נשמרה במיקום ~/"
+msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "החיבור לשרת נכשל, התוכנה תסגר כעת"
+msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "מתעלם מהצעות סחר נכנסות"
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "לא ניתן לטעון את המפה"
+msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגיאה בעת טעינת %s"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "חבורה (%s)"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "שם"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "תקוף"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "דבר"
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "אפס"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "מקסימום"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "חנות"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "מכר"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "בטל"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "שנה כתובת דואר אלקטרוני"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "משתמש: %s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "הקלד כתובת דוא\"ל חדשה פעמיים:"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "הקלד סיסמה חדשה פעמיים:"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "שם:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "צבע שיער:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "תיספורת:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "צור"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "זכר"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "נקבה"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "אנא חלק %d נקודות"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוים בשם."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "ניהול משתמש ושחקן"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "בטל רישום"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "שנה כתובת דואר אלקטרוני"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "סגור"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d משתמשים נוכחים."
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr "מקליט שמות נוכחים לרישום."
+msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "כן"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "לא"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "מפה"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "כותרת: %s"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "שם: %s"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "חלון מיני מפה"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "אפקטים חלקיים"
+#: src/gui/debugwindow.cpp:393
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "מידע חלקי"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "אופף FX"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "סגור"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "אישור"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "לבוש"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "עזרה"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "סגור"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "ציוד"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr "בשימוש:"
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "השלך"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "בשימוש:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
+msgstr "אחסן"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr "החזר"
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "אישור"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "הכל"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצים לאחסן."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצים להחזיר."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "משקל: "
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "זכור שם משתמש"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "הרשם"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "שרת"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "מפה"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "ממתין לשרת"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "הבא"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "שלח"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "אפס"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "הבא"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "אל:"
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "שלח"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:87
 msgid "Unequip first"
-msgstr "הורד"
+msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "טקסט"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "הצללת טקסט"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "סחרר"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "מתאר הטקסט"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
+msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "תוויות סרגל התקדמות"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
+msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "רקע"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "הדגשה"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "לשונית הדגשה"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
+msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "החפץ יקר מדי"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "החפץ בשימוש"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "שחקן"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "לחישה"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "הינו"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "חבורה"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "גילדה"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "שרת"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "רישום"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "קישור"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
+msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "נהיה"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "שמות המשתמשים האחרים"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "השם שלך"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
+msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "שמות המנהלים"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "דמויות"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "מפלצות"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "סוג חפץ לא ידוע"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "כלליים"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "כובעים"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "שימושיים"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "חולצות"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr ""
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "נשקים ליד אחת"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "מכנסיים"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "נעליים"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "נשקים ליד אחת"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "מגנים"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "טבעות"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "שרשראות"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "ידיים"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "תחמושת"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "אפקטים חלקיים"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "הודעה על לקיחה"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
+msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "הודעה על נק' נסיון"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
+msgstr ""
 
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "משתמש מכה מפלצת"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
+msgstr ""
 
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "משתמש מכה משתמש"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
+msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "מכה קריטית"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "פספוס"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
+msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "סרגל חיים"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 סרגל חיים"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 סרגל חיים"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 סרגל חיים"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "סוחר עם%s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "התקפה %+d"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "לחישה"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|הצע חברות %s@@"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "מזלזל"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "מתעלם"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|התעלם לחלוטין %s@@"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|הזמן את %s להצטרף לגילדה@@"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|הזמן את %s להצטרף לחבורה@@"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-#, fuzzy
-msgid "Kick player"
-msgstr "העפה נכשלה!"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|דבר אל %s@@"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|העף מפלצת@@"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|הוסף שם לשיחה@@"
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "הרם"
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|הוסף לשיחה@@"
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "אחסן"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "החזר"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "החלף שרת"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:58
 msgid "Switch character"
 msgstr "החלף שחקן"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "מסיים להקליט."
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "אינו מקליט כרגע."
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "כבר מקליט."
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "מתחיל להקליט..."
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "שגיאה בהתחלת ההקלטה."
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "מקליט..."
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "מפסיק להקליט"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "דוא\"ל:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "בחר את השרת שלך"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "שרת:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "פורט:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "שרת:"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "מתחבר..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "סמן-עכבר מותאם"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "ממתין לשרת"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "צליל"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "שמע"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "ללא טקסט"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "כך הצבע נראה"
-
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "צבעים"
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "הכנס את כל הלחישות ללשוניות"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr "כך הצבע נראה"
+
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "סוג: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "סטטי"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "פעימה"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "קשת בענן"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "מינסרה"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "עיכוב: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "אדום: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "ירוק: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "כחול: "
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "אשר"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "כייל"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "עצור"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "שנה"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "נמצאו קונפליקטי מקשים."
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "מפלצות"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "שחקנים"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "שם"
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "שמות גלויים"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "התנהגות"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "ניטרלי"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "חבר"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "מזלזל"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "מתעלם"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "אפשר מסחר"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "אפשר לחישות"
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
-msgstr "הכנס את כל הלחישות ללשוניות"
-
-#: src/gui/setup_players.cpp:234
-#, fuzzy
-msgid "Show gender"
-msgstr "הצג שם"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "שחקנים"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "כאשר מתעלם:"
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "מזערי"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "קטן"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "בינוני"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "גדול"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "גודל הגופן"
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr "טען מחדש כדי שהשינוי יחול."
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "ללא טקסט"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "טקסט"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "בועות, ללא שמות"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "בועות עם שמות"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "כבוי"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "נמוך"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "גבוה"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "בינוני"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "מקסימלי"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "‏OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "שמות גלויים"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "הצג שם"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "הצג התרעת לקיחה"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "בשיחה"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "באופן חלקי"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "הגבלת FPS:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "וידאו"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "הצג שם"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "טקסט מעל הראש"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "מידע חלקי"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "גודל הגופן"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "לא"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "מצב ושיחזור מצב ישן נכשלו!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:387
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "מצב ושיחזור מצב ישן נכשלו!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "מחליף למסך מלא"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "משנה OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "רזולוצית המסך השתנתה"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "טען מחדש כדי שהשינוי יחול."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "הגדרות השינוי החלקי השתנו."
+msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "השינויים יחולו על שינוי המפה."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "הוסף"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "בקשה למסחר"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "כישורים"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "למעלה"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "נקודות כישורים:  %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "נקודות כישורים:  %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "כישורים"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "רמה: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "רמה: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr "גילדה"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:160
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "גילדה נוצרה."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "צור גילדה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "האם אתה בטוח שברצונך לצאת?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "חבורה"
+
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > הזמן משתמש לחבורה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "/party > הזמן משתמש לחבורה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "האם אתה בטוח שברצונך לצאת?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "צור שחקן"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "הזמן משתמש"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "גדול"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "אשר את ההזמנה של %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "דחה את ההזמנה של %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "אשר את ההזמנה של %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "דחה את ההזמנה של %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:463
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1257
+#, c-format
 msgid "Creating guild called %s."
-msgstr "שגיאה ביצירת גילדה."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "גילדה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "בחר את השרת שלך"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:497
-#, fuzzy
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s הזמין אותך להצטרף לחבורת %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "אשר את הזמנת חבורה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s הזמין אותך לחבורה שלהם."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s הזמין אותך להצטרף לחבורת %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "חבורה"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "בחר את השרת שלך"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "חיים:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "נסיון:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr "קסם:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr "עבודה:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "חיים:"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "קסם:"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "נסיון:"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "זהב: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "עבודה:"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "נתוני שחקן - אישור"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "נקודות כישורים:  %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "רמה: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "איחסון"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "מציע לחור"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "אושר. ממתין..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "הסכם למסחר"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "מוסכם. ממתין..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr "סחור: אתה"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "סחרר"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "הוסף"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "אתה מקבל %s."
+msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "שחק"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "-"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "הסתיים"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "נהיה"
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "שמות המשתמשים האחרים"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "השם שלך"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "שמות המנהלים"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "דמויות"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "אפקטים חלקיים"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "הודעה על לקיחה"
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "הודעה על נק' נסיון"
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "מכה קריטית"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "פספוס"
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > רשימת המשתמשים בחדר הנוכחי"
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > קבע את כותרת נושא החדר"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr "/quit >עזוב את החדר"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr "/op > הפוך משתמש למנהל החדר"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > העף משתמש מהחדר"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "פקודה: /users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr "פקודה זו מציגה את המשתמשים בחדר."
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "פקודה: /topic <message>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr "פקודה זו מציבה את <message> ככותרת נושא החדר."
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "פקודה: /quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr "הפקודה מוציאה אותך מהחדר הנוכחי."
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "אם הינך האדם האחרון בחדר, הוא יימחק."
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "פקודה: /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr "פקודה זו הופכת את <nick> למנהל החדר."
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "אם <nick> מכיל רווחים בתוכו, תחום אותו במרכאות כפולות (\")."
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "מנהלי חדר יכולים להעיף משתמשים ולהפוך משתמשים אחרים בחדר למנהלים."
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "פקודה: /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr "פקודה זו גורמת ל-<nick> לעזוב את החדר."
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr "צריך משתמש שינהל!"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr "צריך משתמש שיעיף!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "הודעה גלובאלית:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "הודעה גלובאלית מאת %s:"
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s: לוחש: "
-
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "לא ניתן לשלוח הודעה ריקה!"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr "/close > סוגר את לשונית הלחישות"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "פקודה: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr "הפקודה סוגרת את לשונית הלחישות הנוכחית."
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "פקודה: /item"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "קיצור־דרך"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "בחר אישור"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "שנה"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "בחר את השרת שלך"
+msgstr ""
+
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "הזז שמאלה"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "תקוף"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr ""
+
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
 msgid "Smilie"
 msgstr "חייך"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "דבר"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "כוון לקרוב ביותר"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr "הרם"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "מצא נתיב לעכבר"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "קיצור־דרך לחפץ %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "חלון כישורים"
+msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "חלון מצב"
+msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "סגירת הצ'אט"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הבאה"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "בחר אישור"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "פתור אותם, אחרת המשחק עלול להתנהג באופן מוזר."
+msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
-msgstr "לא ניתן להרים את החפץ."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
-#, fuzzy, c-format
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "הרמת %s [@@%d|%s@@]."
-msgstr[1] "הרמת %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
+#: src/localplayer.cpp:3478
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:50
+msgid "              to the manaplus client."
+msgstr ""
+
+#: src/main.cpp:52
 msgid "Options:"
 msgstr "אפשרויות:"
 
-#: src/main.cpp:45
-#, fuzzy
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Display the version"
+msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
+#: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Display this help"
+msgstr ""
 
-#: src/main.cpp:47
-#, fuzzy
+#: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Configuration file to use"
+msgstr ""
 
-#: src/main.cpp:48
-#, fuzzy
+#: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Login with this username"
+msgstr ""
 
-#: src/main.cpp:49
-#, fuzzy
+#: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Login with this password"
+msgstr ""
 
-#: src/main.cpp:50
-#, fuzzy
+#: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Login with this character"
+msgstr ""
 
-#: src/main.cpp:51
-#, fuzzy
+#: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Login server name or IP"
+msgstr ""
 
-#: src/main.cpp:52
-#, fuzzy
+#: src/main.cpp:62
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Login server port"
+msgstr ""
 
-#: src/main.cpp:53
-#, fuzzy
+#: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Use this update host"
+msgstr ""
 
-#: src/main.cpp:54
-#, fuzzy
+#: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Choose default character server and character"
+msgstr ""
 
-#: src/main.cpp:56
-#, fuzzy
+#: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Skip the update downloads"
+msgstr ""
 
-#: src/main.cpp:57
-#, fuzzy
+#: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Directory to load game data from"
+msgstr ""
 
-#: src/main.cpp:58
-#, fuzzy
+#: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Directory to use as home directory"
+msgstr ""
 
-#: src/main.cpp:59
-#, fuzzy
+#: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Directory to use as home directory"
-
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "העפה נכשלה!"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "העפה הצליחה!"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
 msgstr "אין מה למכור."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
 msgstr "תודה על הקנייה."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
 msgstr "לא ניתן לקנות."
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "תודה על המכירה."
-
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "לא ניתן למכור."
-
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "הגישה נדחתה"
-
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "לא ניתן להשתמש ב-ID זה."
-
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "שגיאה לא ידועה בבחירת השחקן"
-
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "נכשל ביצירת השחקן. ייתכן כי שם זה כבר תפוס."
-
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "מידע"
-
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "השחקן נמחק."
-
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "נכשל במחיקת השחקן."
-
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
-msgstr "עוצמה:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
-msgstr "זריזות:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
-msgstr "חיוניות:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
-msgstr "תבונה:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
-msgstr "מיומנות:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
-msgstr "מזל:"
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "הלחישה לא יכלה להשלח, המשתמש אינו מחובר."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "שחקן"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
-msgstr "חדרים אינם נתמכים!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "שם"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "בקשה למסחר"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
-msgstr "עוצמה %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
-msgstr "זריזות %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "מידע"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "חיוניות %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
-msgstr "תבונה %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "מיומנות %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
-msgstr "מזל %+d"
-
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "האימות נכשל"
-
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
-msgid "No servers available."
-msgstr "אין שרתים זמינים"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "אדם אחר מנסה להשתמש בחשבון זה"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "חשבון זה כבר מחובר"
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "פריצת מהירות זוהתה"
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-#, fuzzy
-msgid "Duplicated login."
-msgstr "התחברות כפולה"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "שגיאת חיבור לא ידועה"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "נותקת מהשרת!"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "עוצמה"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "זריזות"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "חיוניות"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "תבונה"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "מיומנות"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "מזל"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "הגנה:"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "התקפת קסם:"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "הגנת קסם:"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "גילדה נוצרה."
 
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% דיוק:"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% התחמקות:"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "מכה קריטית"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > מציג עזרה זו."
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > הזמן שחקן לחבורה שלך"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > עזוב את החבורה בה אתה נמצא"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > העף מישהו מהחבורה בה אתה נמצא"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "פקודה: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "פקודה זו מזמינה את <nick> להיות בחבורתך."
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "פקודה: /leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "פקודה זו גורמת לשחקן לעזוב את החבורה."
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "שם חבורה חסר."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s הצטרף לחבורה."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "תגובה לא ידועה להזמנה עבור %s."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > הזמן שחקן לחבורה שלך"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > עזוב את החבורה בה אתה נמצא"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > העף מישהו מהחבורה בה אתה נמצא"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > הצג/שנה את אפשרויות השיתוף של חפץ בחבורה"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > הצג/שנה את אפשרויות שיתוף הנסיון בחבורה"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "פקודה זו גורמת לשחקן לעזוב את החבורה."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "פקודה: /item <policy>"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "הפקודה משנה את מדיניות השיתוף של חפצים בחבורה."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> יכול להיות אחד מ- \"1\", \"yes\", \"true\" כדי לאפשר שיתוף חפץ, או "
-"\"0\", \"no\", \"false\" כדי לבטל שיתוף חפץ."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "פקודה: /item"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "הפקודה מציגה את מדיניות השיתוף של חפצים בחבורה."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "פקודה: /exp <policy>"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "פקודה זו משנה את מדיניות שיתוף הנסיון בחבורה."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> יכול להיות  \"1\", \"yes\", \"true\" כדי לאפשר שיתוף נסיון, או \"0"
-"\", \"no\", \"false\" כדי לבטל שיתוף נסיון."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "פקודה: /exp"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "פקודה זו מציגה את מדיניות שיתוף הנסיון הנוכחית בחבורה."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "שיתוף חפצים מאופשר."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "שיתוף חפצים מבוטל."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "שיתוף חפצים לא אפשרי."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "שיתוף חפצים מאופשר."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "שיתוף נסיון מאופשר."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "שיתוף נסיון מבוטל."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "שיתוף נסיון לא אפשרי."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "שיתוף נסיון מאופשר."
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "נכשל בשימוש בחפץ."
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "לא ניתן ללבוש."
-
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "לא ניתן להסיר."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "החשבון לא נמצא. אנא נסה להתחבר שנית."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr "הסיסמה הישנה שגויה"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "הסיסמה החדשה קצרה מדי"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "שגיאה לא ידועה"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "ID לא רשום"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "סיסמה שגויה"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "המשתמש מושהה"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "הועפת מהשרת"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "הורחקת לצמיתות מן המשחק. אנא צור קשר עם צוות המנהלים."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"הורחקת זמנית מן המשחק עד %s.\n"
-"אנא צור קשר עם צוות המנהלים באמצעות מערכת הפורומים."
 
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "שם המשתמש כבר נלקח"
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "לא ניתן למכור."
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "מתחבר לשרת המפה..."
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "לא היה ניתן ליצור חבורה."
+msgstr ""
 
 #: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "חבורה נוצרה בהצלחה."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s כבר חבר בחבורה."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s דחה את הזמנתך."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s הצטרף לחבורה."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "תגובה לא ידועה להזמנה עבור %s."
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "עזבת את החבורה."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s עזב את החבורה שלך."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "משתמש לא ידוע ניסה לומר: %s"
-
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "הזמנה בדרך זו אינה נתמכת כרגע."
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s אינו נמצא בחבורתך!"
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "אתה מת."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "צר לנו לבשר לכם כי שחקנכם נהרג בקרב."
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "אינך חי כל־כך כרגע."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "קור ידיו של המוות הקודר אוחזים בנשמתך."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "המשחק נגמר!"
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "הכנס מטבע כדי להמשיך."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "לא, ילדים. השחקן שלכם לא באמת מת. הוא... אה... הלך למקום טוב יותר."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "תוכניתך לשבור את נשק האויב באמצות צווארך נכשלה."
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "אני מניח שלא הלך לך כל־כך טוב."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "האם ברצונך שיאתרו את חלקי גופתך?"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "באופן מצער, מעולם לא נמצא זכר ממך..."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "הושמדתך."
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "נראה כאילו ראשך נמסר אליך."
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל אחת חדשה."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "אינך מת עדיין. אתה רק נח."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "אינך יותר."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "חדלת מלהתקיים."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "התפוגגת ועברת לפגוש את הבורא."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "אינך מת עדיין. אתה רק נח."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "נטול חיים, את נח על משכבך."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "אתה לא מת עדיין! אה.. טוב, עכשיו כן."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "חילוף החומרים שלך הפך להיסטוריה."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr "אתה מכה כמו גופה."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "חדלת מלהתקיים."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr "התפוגגת ועברת לפגוש את הבורא."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "הינך שחקן לשעבר."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "אתה מת. טוב שיש חברת ביטוח..."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "הודעה"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "אתה סוחב יותר מחצי ממשקלך. אינך יכול לאחות את החיים."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "הרמת "
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
-msgstr "הצטייד בחצים תחילה."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "המסחר נכשל!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "הבעה נכשלה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "הישיבה נכשלה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "יצירת שיחה נכשלה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "לא היה ניתן להצטרף לחגיגה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "לא ניתן לצעוק!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "לא הגעת לרמה גבוהה מספיק!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "לא נותרו נק' חיים!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "לא נותרו נק' קסם!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "אין תזכירים!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "אינך יכול לעשות זאת כרגע!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "נראה שאתה צריך עוד כסף... ;-)"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "אינך יכול להשתמש בכישור עם נשק זה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "אתה צריך עוד אבן אדומה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "אתה צריך עוד אבן כחולה!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "אתה סוחב יותר מדי בכדי לעשות זאת!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "הא? מה זה?"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "הפיתול נכשל...."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "לא היה ניתן לגנוב דבר..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "לרעל לא הייתה כל השפעה..."
-
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "בקשה למסחר"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "מסחר אינו אפשרי. השותף למסחר רחוק מדי."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "מסחר אינו אפשרי. השחקן אינו קיים."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "המסחר בוטל מסיבה לא ידועה."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "מסחר: אתה ו-%s"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "המסחר עם %s בוטל."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "המסחר נכשל"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "נכשל בהוספת חפץ. השותף למסחר שוקל יותר מדי."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "נכשל בהוספת חפץ. לשותף למסחר אין מקומות פנויים."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "נכשל בהוספת חפץ מסיבה לא ידועה."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "המסחר בוטל."
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "המסחר הושלם."
 
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "עוצמה"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "זריזות"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "מיומנות"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "חיוניות"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "תבונה"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr " לחץ אישור כדי להשיב"
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "נהרגת"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr "כבר מחובר"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "שם המשתמש כבר בשימוש"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "נתוני שחקן - אישור"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "נתוני שחקן - אישור"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "השחקן נמחק."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "בחר כמות חפצים לסחור."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "שגיאה לא ידועה"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr "אין שרתי משחק זמינים."
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "כח רצון:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "כותרת: %s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "משתמש מכה מפלצת"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "פקודה: /join <channel>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "מבקש להצטרף לחדר %s."
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s הצטרף לחבורה."
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "פקודה לא מוכרת."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "כח רצון %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "כח רצון:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "גילדה נוצרה."
+msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "שגיאה ביצירת גילדה."
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr "הזמנה נשלחה."
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr "החבר קודם בהצלחה."
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr "נכשל בקידום החבר."
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "magic_token שגוי"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "כבר מחובר"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "השרת מלא"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "הסיסמה החדשה שגויה"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "החשבון אינו מחובר. אנא קודם־כל התחבר."
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "כתובת דוא\"ל חדשה שגויה"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "כתובת דוא\"ל ישנה שגויה"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "גרסת הקליינט ישנה מדי"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "שם משתמש או סיסמה שגויים"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "שם משתמש, סיסמה או דוא\"ל שגויים"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "שם המשתמש כבר בשימוש"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "כתובת הדוא\"ל כבר בשימוש"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr "הצטרפת לחבורה."
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s דחה את הזמנתך."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr "מקבל בקשות מסחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr "מתעלם מבקשות סחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "סוחר עם%s"
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|התעלם לחלוטין %s@@"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "העפה נכשלה!"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "העפה הצליחה!"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "תודה על המכירה."
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "לא ניתן למכור."
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "התקפה %+d"
+msgid "Strength %+d"
+msgstr "עוצמה %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "הגנה %+d"
+msgid "Agility %+d"
+msgstr "זריזות %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "חיים %+d"
+msgid "Vitality %+d"
+msgstr "חיוניות %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "חפץ לא ידוע"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "ללא שם"
-
-#~ msgid "no"
-#~ msgstr "לא"
-
-#~ msgid "Buddy"
-#~ msgstr "חבר"
-
-#~ msgid "Buddy List"
-#~ msgstr "רשימת חברים"
-
-#~ msgid "Description: %s"
-#~ msgstr "תיאור: %s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "השפעה: %s"
-
-#~ msgid "Previous"
-#~ msgstr "הקודם"
-
-#~ msgid "New"
-#~ msgstr "חדש"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "רמת עבודה: %d"
-
-#~ msgid "Present: "
-#~ msgstr "נוכחים: "
-
-#~ msgid "Quit Guild"
-#~ msgstr "עזוב גילדה"
-
-#~ msgid "Ok"
-#~ msgstr "אישור"
-
-#~ msgid "Recent:"
-#~ msgstr "לאחרונה:"
-
-#~ msgid "Magic"
-#~ msgstr "קסם"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "הטל קסם נסיון 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "הטל קסם נסיון 2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "הטל קסם נסיון 3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "נשקים לשתי ידיים"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|סחור עם %s@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|תקוף את %s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|זלזל %s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|התעלם %s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|אל-התעלם %s@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|העף שחקן@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|ביטול@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|הרם %s@@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|הפשט@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|השתמש@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Use@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|השלך@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|פצל@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|אחסן@@"
-
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|החזר@@"
-
-#~ msgid "Select Server"
-#~ msgstr "בחר שרת"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "נכשל במעבר אל "
-
-#~ msgid "windowed"
-#~ msgstr "חלון"
-
-#~ msgid "fullscreen"
-#~ msgstr "מסך מלא"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "כישור מיסתורי"
-
-#~ msgid "Weapons"
-#~ msgstr "נשקים"
-
-#~ msgid "Crafts"
-#~ msgstr "מלאכה"
-
-#~ msgid "Stats"
-#~ msgstr "רמות"
+msgid "Intelligence %+d"
+msgstr "תבונה %+d"
 
-#~ msgid "Total"
-#~ msgstr "סה\"כ"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "מיומנות %+d"
 
-#~ msgid "Cost"
-#~ msgstr "עלות"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "מזל %+d"
 
-#~ msgid "Attack:"
-#~ msgstr "התקפה:"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% ריפלקס:"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "נקודות מצב נותרות: %d"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "Max level"
-#~ msgstr "רמה מקסימלית"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "curl error "
-#~ msgstr "שגיאת קיפולים: "
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid " host: "
-#~ msgstr " שרת מארח: "
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Guilds"
-#~ msgstr "גילדות"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Buddys"
-#~ msgstr "חברים"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "נותקת מהשרת!"
 
-#~ msgid "Party Window"
-#~ msgstr "חלון חבורה"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "מזל"
 
-#~ msgid "Unarmed"
-#~ msgstr "ללא תחמושת"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "סכין"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "חרב"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Polearm"
-#~ msgstr "נשק מוט"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "מקל"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "שוט"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "קשת"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Shooting"
-#~ msgstr "ירייה"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Mace"
-#~ msgstr "שרביט"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "Axe"
-#~ msgstr "גרזן"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Thrown"
-#~ msgstr "זריקה"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Craft"
-#~ msgstr "מלאכה"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Unknown Skill"
-#~ msgstr "כישור לא ידוע"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s אינו נמצא בחבורתך!"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " can't be created, but it doesn't exist! Exiting."
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "לא ניתן להגדיר "
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid " video mode: "
-#~ msgstr " מצב וידאו: "
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "מתחבר לשרת השחקן..."
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "ללא שם"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "מתחבר לשרת החשבון..."
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "התקפה %+d"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > שם נוסף ל-create"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "הגנה %+d"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "פקודה: /new <party-name>"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "חיים %+d"
 
-#~ msgid "a"
-#~ msgstr "‎"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "ללא שם"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "חפץ לא ידוע"
 
-#~ msgid "Scroll radius"
-#~ msgstr "תווך גלילה"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "עצלנות גלילה"
diff --git a/po/hr.po b/po/hr.po
index a1dc5999a..e52a56bdc 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,139 +1,127 @@
-# Croatian translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2009-12-13 09:30+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #: src/actorspritemanager.cpp:1034
-#, fuzzy
 msgid "Visible on map"
-msgstr "Vidljiva imena"
+msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
-#, fuzzy
+#: src/being.cpp:1519
 msgid "I"
-msgstr "Je"
+msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:908
-#, fuzzy
+#: src/client.cpp:909
 msgid "Connecting to server"
-msgstr "Spajanje na poslužitelja karti..."
+msgstr ""
 
-#: src/client.cpp:939
-#, fuzzy
+#: src/client.cpp:940
 msgid "Logging in"
-msgstr "Korisničko ime"
+msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
-#, fuzzy
+#: src/client.cpp:1073
 msgid "Requesting characters"
-msgstr "Odaberi lika"
+msgstr ""
 
-#: src/client.cpp:1103
-#, fuzzy
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
-msgstr "Spajanje na poslužitelja karti..."
+msgstr ""
 
-#: src/client.cpp:1113
-#, fuzzy
+#: src/client.cpp:1114
 msgid "Changing game servers"
-msgstr "Server"
+msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
-#, fuzzy
+#: src/client.cpp:1194
 msgid "Password Change"
-msgstr "Lozinka"
+msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email Change"
-msgstr "Izmijeni"
+msgstr ""
 
-#: src/client.cpp:1214
-#, fuzzy
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
-msgstr "Član je uspješno unaprijeđen."
+msgstr ""
 
-#: src/client.cpp:1234
-#, fuzzy
+#: src/client.cpp:1235
 msgid "Unregister Successful"
-msgstr "Odjavi"
+msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -146,7 +134,7 @@ msgstr "Nepoznata naredba."
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -155,105 +143,97 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:456
-#, fuzzy
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
-msgstr "Ime partije nedostaje."
+msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:555
-#, fuzzy
+#: src/commandhandler.cpp:561
 msgid "friend"
-msgstr "Prijatelj"
+msgstr ""
 
-#: src/commandhandler.cpp:560
-#, fuzzy
+#: src/commandhandler.cpp:566
 msgid "disregarded"
-msgstr "Zanemareno"
+msgstr ""
 
-#: src/commandhandler.cpp:565
-#, fuzzy
+#: src/commandhandler.cpp:571
 msgid "neutral"
-msgstr "Neutralno"
+msgstr ""
 
-#: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#: src/commandhandler.cpp:590
+#, c-format
 msgid "Player already %s!"
-msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgstr ""
 
-#: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#: src/commandhandler.cpp:604
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Partija je uspješno kreirana."
+msgstr ""
 
-#: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#: src/commandhandler.cpp:612
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
-#, fuzzy
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
-msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgstr ""
 
-#: src/commandhandler.cpp:654
-#, fuzzy
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
-msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgstr ""
 
-#: src/commandhandler.cpp:665
-#, fuzzy
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
-msgstr "Partija je uspješno kreirana."
+msgstr ""
 
-#: src/commandhandler.cpp:667
-#, fuzzy
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
-msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
+msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -261,7 +241,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -269,7 +249,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -277,7 +257,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -285,7 +265,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -293,31 +273,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1082
-#, fuzzy
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
-msgstr "Veličina fonta"
+msgstr ""
 
-#: src/commandhandler.cpp:1094
-#, fuzzy
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
-msgstr "Veličina fonta"
+msgstr ""
 
-#: src/commandhandler.cpp:1098
-#, fuzzy
+#: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr "Stvori"
+msgstr ""
 
-#: src/commandhandler.cpp:1100
-#, fuzzy
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr "Obriši"
+msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -326,107 +302,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
-#, fuzzy
+#: src/game.cpp:488
 msgid "Screenshot saved as "
-msgstr "Screenshot spremljen u ~/"
+msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:523
-#, fuzzy
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
-msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
+msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1576
-#, fuzzy
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
-msgstr "Ne mogu učitati karte"
+msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
-#: src/gui/beingpopup.cpp:118
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:124
+#, c-format
 msgid "Party: %s"
-msgstr "Partija (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:132
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:138
+#, c-format
 msgid "Guild: %s"
-msgstr "Cehovi"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:162
+#, c-format
 msgid "Comment: %s"
-msgstr "Naredba: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Chat Prozor"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
-msgstr "Pomakni Gore"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kupi"
 
@@ -440,7 +411,7 @@ msgstr "Cijena: %s / Ukupno: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -448,30 +419,30 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Izlaz"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -480,19 +451,19 @@ msgstr "Prodaj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -506,24 +477,22 @@ msgid "Account: %s"
 msgstr "Korisnički račun: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Utipkajte Novu Email Adresu dvaput:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Korisničko ime mora biti dugo najmanje %d znakova."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Korisničko ime mora biti kraće od %d znakova."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Nova E-mail Adresa već postoji."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -536,23 +505,22 @@ msgid "Password:"
 msgstr "Lozinka"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Utipkajte Novu Lozinku dvaput:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Lozinka mora biti duga najmanje %d znakova."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Lozinka mora biti kraća od %d znakova."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -582,14 +550,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Boja kose:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Frizura:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -648,82 +614,71 @@ msgid "Unregister"
 msgstr "Odjavi"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Promijeni Email Adresu"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Pogrešna lozinka"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Neuspješno brisanje znaka."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Pogrešna lozinka"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Obriši"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Zatvori"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Nivo: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Zadano"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Prijatelj"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Zelena: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Plava: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "nisko"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hiperveza"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -738,25 +693,22 @@ msgid "brown"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Duga"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Duga"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Duga"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -764,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:606
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d igrača je prisutno."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -782,63 +734,54 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
-#, fuzzy
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
-msgstr "Ignorirano"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karta"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Slijedeći"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Tema: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Ime: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "Prozor Minikarte"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Vlastiti kursor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Igrač pogađa Čudovište"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Efekti Čestica"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -870,51 +813,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Efekti Čestica"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Ciljaj Igrača"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Ciljaj Igrača"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Ciljaj Igrača"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Ciljaj Igrača"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Napad %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Prozor Minikarte"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -923,9 +859,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Kritični Udarac"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -948,37 +883,35 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zatvori"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Prethodni"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Slijedeći"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -987,7 +920,7 @@ msgid "Help"
 msgstr "Pomoć"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Zalihe"
 
@@ -1000,51 +933,47 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:116
-#, fuzzy
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:122
-#, fuzzy
 msgid "na"
-msgstr "jedan"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:123
-#, fuzzy
 msgid "az"
-msgstr "jedan"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
-#, fuzzy
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
-msgstr "Ispusti"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -1053,17 +982,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
@@ -1101,71 +1030,67 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Nepoznata greška"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Težina: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Prozor Statusa"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Poništi"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Poništi"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Nivo: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Cijena: %s / Ukupno: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1173,7 +1098,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1181,29 +1106,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1212,9 +1137,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Zatvori"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1224,7 +1148,7 @@ msgstr ""
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Poslužitelj:"
@@ -1234,9 +1158,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Zapamti korisničko ime"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1247,51 +1170,46 @@ msgid "Register"
 msgstr "Registriraj se"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr "Težina: "
+msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr "Stanje"
+msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1308,19 +1226,17 @@ msgid "Submit"
 msgstr "Dostavi"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
-msgstr "Zatvori"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Slijedeći"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1340,384 +1256,340 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Novac: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Skini opremu"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
-msgstr "Šapat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
-#, fuzzy
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr "Prijatelj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
-#, fuzzy
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
-msgstr "Zanemareno"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
-msgstr "Ignorirano"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
-#, fuzzy
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr "nisko"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
-#, fuzzy
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
-msgstr "Promijeni Email Adresu"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
-#, fuzzy
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
-msgstr "/party > Pozovite korisnike na partiju"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
-#, fuzzy
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
-msgstr "@@admin-kick|Šutni igrača@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
-#, fuzzy
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
-msgstr "@@admin-kick|Šutni igrača@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
-#, fuzzy
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
-msgstr "Izmijeni"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
-#, fuzzy
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
-msgstr "/party > Pozovite korisnike na partiju"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:238
-#, fuzzy
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr "Šut nije uspio!"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
-#, fuzzy
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
-msgstr "Prikaži ime"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
-#, fuzzy
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr "Prodaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
-#, fuzzy
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
-msgstr "@@attack|Napadni %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:311
-#, fuzzy
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
-msgstr "@@attack|Napadni %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:314
-#, fuzzy
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
-#, fuzzy
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
-msgstr "@@chat|Dudaj u chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:476
-#, fuzzy
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr "Pokupi"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
-#, fuzzy
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
-msgstr "@@chat|Dudaj u chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
-#, fuzzy
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr "Zapamti korisničko ime"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
-#, fuzzy
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
-msgstr "Zapamti korisničko ime"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
-msgstr "Istakni Karticu"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
-msgstr "Istakni Karticu"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
-#, fuzzy
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
-msgstr "Zapamti korisničko ime"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:575
-#, fuzzy
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:580
-#, fuzzy
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
-msgstr "Omogući/Onemogući Trgovanje"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Veliko"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:744
-#, fuzzy
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
-msgstr "Izmijeni"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
-#, fuzzy
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
-msgstr "@@chat|Dudaj u chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
-#, fuzzy
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
-msgstr "@@chat|Dudaj u chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
-#, fuzzy
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
-#, fuzzy
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
-#, fuzzy
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
-msgstr "Pohrani"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
-#, fuzzy
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr "Ispusti"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
-#, fuzzy
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
-msgstr "Preuzmi"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
-#, fuzzy
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
-msgstr "Preuzmi"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
-#, fuzzy
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
-msgstr "Preuzmi"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
-#, fuzzy
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
-msgstr "@@chat|Dudaj u chat@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Zadano"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
-#, fuzzy
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr "Pomakni Gore"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
-#, fuzzy
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
-msgstr "Pomakni Dolje"
-
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:56
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Promijeni lika"
 
@@ -1753,70 +1625,64 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:228
-#, fuzzy
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
-msgstr "Izaberite vaš server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:239
-#, fuzzy
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Izaberite vaš server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
-#, fuzzy
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
-msgstr "Poslužitelj:"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
-#, fuzzy
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
-msgstr "Spajanje..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-#, fuzzy
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
-msgstr "Vlastiti kursor"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
-#, fuzzy
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
-msgstr "Čekanje servera"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1834,14 +1700,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Omogući igraću palicu"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Omogući igraću palicu"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1860,9 +1724,8 @@ msgid "Music volume"
 msgstr "Glasnoća glazbe"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Nema teksta"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1885,9 +1748,8 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Naredba: /who"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1918,9 +1780,8 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Poruka"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1931,38 +1792,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Stavi sve šapate u kartice"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
-#, fuzzy
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:105
-#, fuzzy
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:108
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Prikaži ime"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:111
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Sljedeća Chat Kartica"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1971,9 +1832,8 @@ msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Tip: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1995,42 +1855,33 @@ msgid "Spectrum"
 msgstr "Spektar"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Odgoda: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Crvena: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Zelena: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Plava: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
@@ -2064,9 +1915,8 @@ msgid "Assign"
 msgstr "Dodijeli"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Dodijeli"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2076,336 +1926,368 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
-#, fuzzy
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr "Prikaži ime"
+msgstr ""
 
-#: src/gui/setup_other.cpp:67
-#, fuzzy
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr "kao čestica"
+msgstr ""
 
-#: src/gui/setup_other.cpp:70
-#, fuzzy
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
-msgstr "Istakni"
+msgstr ""
 
-#: src/gui/setup_other.cpp:73
-#, fuzzy
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
-msgstr "Istakni"
+msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
-msgstr "Igrač"
+msgstr ""
 
-#: src/gui/setup_other.cpp:106
-#, fuzzy
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
-msgstr "Prikaži ime"
+msgstr ""
 
-#: src/gui/setup_other.cpp:109
-#, fuzzy
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
-msgstr "Omogući igraću palicu"
+msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
-#, fuzzy
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
-msgstr "Poruka"
+msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
-#, fuzzy
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_other.cpp:130
-#, fuzzy
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
-#, fuzzy
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
-msgstr "Omogući/Onemogući Trgovanje"
+msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
-#, fuzzy
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_other.cpp:154
-#, fuzzy
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
-msgstr "Omogući igraću palicu"
+msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
-#, fuzzy
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
-msgstr "Ne može se kupiti"
+msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
-#, fuzzy
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
-msgstr "Pozadina"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Igrači"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Vidljiva imena"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Odnos"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutralno"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Prijatelj"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Zanemareno"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorirano"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Stavi sve šapate u kartice"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Prikaži ime"
-
-#: src/gui/setup_players.cpp:267
-msgid "Players"
-msgstr "Igrači"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:292
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_players.cpp:315
-#, fuzzy
-msgid "Show level"
-msgstr "Prikaži ime"
-
-#: src/gui/setup_players.cpp:319
-#, fuzzy
-msgid "Show own name"
-msgstr "Prikaži ime"
-
-#: src/gui/setup_players.cpp:323
-#, fuzzy
-msgid "Target dead players"
-msgstr "Ciljaj Igrača"
-
-#: src/gui/setup_players.cpp:327
-#, fuzzy
-msgid "Secure trades"
-msgstr "Složi se za trgovanje"
-
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
-msgid "Unsecure chars in names"
-msgstr ""
-
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Vidljiva imena"
-
-#: src/gui/setup_players.cpp:341
-#, fuzzy
-msgid "Show statuses"
-msgstr "Prikaži ime"
-
-#: src/gui/setup_theme.cpp:105
-#, fuzzy
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
-msgstr "Sićušno"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:106
-#, fuzzy
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
-msgstr "Maleno"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:107
-#, fuzzy
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
-msgstr "Srednje"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:108
-#, fuzzy
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
-msgstr "Veliko"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
-msgstr "Efekti Čestica"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:146
-#, fuzzy
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
-msgstr "Pomoć"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:147
-#, fuzzy
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
-msgstr "Složi se za trgovanje"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_theme.cpp:281
-#, fuzzy
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
-msgstr "Izmijeni"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2414,14 +2296,12 @@ msgid "Software"
 msgstr ""
 
 #: src/gui/setup_video.cpp:195
-#, fuzzy
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:196
-#, fuzzy
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:223
 msgid "No text"
@@ -2459,145 +2339,114 @@ msgstr "srednje"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:294
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Odnos"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "u chat-u"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "kao čestica"
 
-#: src/gui/setup_video.cpp:305
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Omogući igraću palicu"
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Omogući igraću palicu"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
+#: src/gui/setup_video.cpp:302
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
 #: src/gui/setup_video.cpp:315
-#, fuzzy
-msgid "FPS limit:"
-msgstr "Ograničenje sličica u sekundi"
-
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
-#, fuzzy
-msgid "Alt FPS limit: "
-msgstr "Ograničenje sličica u sekundi"
-
-#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:337
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Detalji Čestica"
+msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Ne"
+msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Prebacivanje u pregled na čitavom ekranu"
+msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:541
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Promjena OpenGL-a"
+msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Rezolucija Ekrana promijenjena"
+msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Postavke efekta čestica su promijenjene."
+msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
@@ -2626,14 +2475,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s želi trgovati s vama, prihvaćate li?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2644,31 +2494,31 @@ msgid "Up"
 msgstr "Gore"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Bodovi vještine: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Bodovi vještine: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Vještine"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Nivo: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Nivo: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Ceh"
 
@@ -2678,9 +2528,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Ceh, ustanovljen."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2692,23 +2542,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Formiraj Ceh"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Jeste li sigurni da želite odustati?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Partija"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Pozovite korisnike na partiju"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2716,9 +2565,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Pozovite korisnike na partiju"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2730,75 +2578,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Jeste li sigurni da želite odustati?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Napad"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Napad"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignorirano"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Stvori Lika"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Pozovi Korisnika"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Prihvaćen poziv od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Odbijen poziv od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Prihvaćen poziv od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Odbijen poziv od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Pogreška pri ustanovljavanju ceha."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2806,43 +2649,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Ceh"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Izaberite vaš server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Primljen zahtjev za partiju, ali ona već postoji."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s vas je pozvao/la da se pridružite %s partiji."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Prihvati Pozivnicu za Partiju"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s vas je pozvao/la da se pridružite %s partiji."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2863,534 +2701,513 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Partija"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Izaberite vaš server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Napad"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Promijeni lika"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Promijeni lika"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Promijeni lika"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Tipkovnica"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Zadatak:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#, c-format
 msgid "Character points: %d"
-msgstr "Podaci lika su u redu"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:267
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Nivo: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:323
+#, c-format
 msgid "Correction points: %d"
-msgstr "Bodovi vještine: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Dozvoli trgovanje"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Općenito"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magija"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magija"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Naredba: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magija"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Naredba: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Ciljaj Igrača"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Najviša razina"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Prikaži ime"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3415,9 +3232,9 @@ msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
 #: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "Vi dobijete %s."
+msgstr ""
 
 #: src/gui/tradewindow.cpp:111
 msgid "You give:"
@@ -3427,47 +3244,46 @@ msgstr "Daješ:"
 msgid "Change"
 msgstr "Izmijeni"
 
-#: src/gui/tradewindow.cpp:332
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Ažuriranje"
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
-#, fuzzy
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1  pokušate ponovno kasnije"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -3476,24 +3292,20 @@ msgid "Being"
 msgstr "Biće"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Prijatelj"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Zanemareno"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignorirano"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM Imena"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3512,23 +3324,20 @@ msgid "NPCs"
 msgstr "NPCs"
 
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Partija"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Ceh"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3543,42 +3352,36 @@ msgid "Exp Notification"
 msgstr "Exp Obavijest"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Igrač pogađa Čudovište"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Imena Drugih Igrača"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Igrač pogađa Čudovište"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Igrač pogađa Čudovište"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3589,29 +3392,24 @@ msgid "Misses"
 msgstr "Promašaji"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Istakni Karticu"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Istakni"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Istakni"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Istakni"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Istakni Karticu"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3622,9 +3420,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3638,23 +3435,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3719,6 +3516,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ova naredba čini <nadimak> operatorom kanala."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
@@ -3753,9 +3551,13 @@ msgid "Global announcement from %s:"
 msgstr "Javna obavijest od %s:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s šaptanje: "
+msgstr ""
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3778,33 +3580,28 @@ msgid "This command closes the current whisper tab."
 msgstr "Ova naredba zatvara trenutnu karticu za šaptaje."
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Naredba: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Ova naredba prikazuje broj igrača trenutno online."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Naredba: /item <policy>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Ova naredba započinje snimanje chat log-a u datoteku <filename>."
+msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Chat Prozor"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3819,9 +3616,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Smajlić"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3856,9 +3652,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Kratica"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3881,25 +3676,22 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Odaberite OK"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Izmijeni"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Izaberite vaš server"
+msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
-msgstr "Pohrana"
+msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -3924,9 +3716,8 @@ msgid "Target & Attack"
 msgstr "Meta i Napad"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3953,9 +3744,8 @@ msgid "Stop Attack"
 msgstr "Prekini Napad"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Ciljaj Najbližeg"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3990,14 +3780,12 @@ msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Promijeni Email Adresu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Prečac do Predmeta %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -4055,43 +3843,36 @@ msgid "Debug Window"
 msgstr "Debug Prozor"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Prozor Vještine"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Prozor Prečica za Ispoljavanje emocija"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Prozor Statusa"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Prozor za Postavke"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Skrij Prozore"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Prozor Statusa"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Naredba: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Chat Prozor"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4102,14 +3883,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Prethodna Chat Kartica"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Sljedeća Chat Kartica"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4171,19 +3950,16 @@ msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Sljedeća Chat Kartica"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
-#, fuzzy
 msgid "Previous chat line"
-msgstr "Prethodna Chat Kartica"
+msgstr ""
 
 #: src/keyboardconfig.cpp:282
-#, fuzzy
 msgid "Next chat line"
-msgstr "Sljedeća Chat Kartica"
+msgstr ""
 
 #: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
@@ -4210,19 +3986,16 @@ msgid "Direct Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:296
-#, fuzzy
 msgid "Direct Down"
-msgstr "Pomakni Dolje"
+msgstr ""
 
 #: src/keyboardconfig.cpp:298
-#, fuzzy
 msgid "Direct Left"
-msgstr "Pomakni Ulijevo"
+msgstr ""
 
 #: src/keyboardconfig.cpp:299
-#, fuzzy
 msgid "Direct Right"
-msgstr "Pomakni Udesno"
+msgstr ""
 
 #: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
@@ -4257,33 +4030,28 @@ msgid "Use magic attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:317
-#, fuzzy
 msgid "Switch magic attack"
-msgstr "Promijeni lika"
+msgstr ""
 
 #: src/keyboardconfig.cpp:319
-#, fuzzy
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
 #: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:323
-#, fuzzy
 msgid "Change Attack Type"
-msgstr "Meta i Napad"
+msgstr ""
 
 #: src/keyboardconfig.cpp:325
-#, fuzzy
 msgid "Change Follow mode"
-msgstr "Promijeni Lozinku"
+msgstr ""
 
 #: src/keyboardconfig.cpp:327
-#, fuzzy
 msgid "Change Imitation mode"
-msgstr "Promijeni Email Adresu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
@@ -4294,9 +4062,8 @@ msgid "On / Off audio"
 msgstr ""
 
 #: src/keyboardconfig.cpp:333
-#, fuzzy
 msgid "Enable / Disable away mode"
-msgstr "Omogući/Onemogući Trgovanje"
+msgstr ""
 
 #: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
@@ -4317,76 +4084,71 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
-#, fuzzy
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
-msgstr "Neuspješno korištenje predmeta."
+msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
-#, fuzzy
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
-msgstr "Server je pun"
+msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
-#, fuzzy, c-format
+#: src/localplayer.cpp:1441
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
-msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
-#, fuzzy
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
-msgstr "Otkazano trgovanje."
+msgstr ""
 
-#: src/localplayer.cpp:3487
-#, fuzzy
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
-msgstr "Promijeni Email Adresu"
+msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
-#, fuzzy
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
-msgstr "Otkazano trgovanje."
+msgstr ""
 
-#: src/localplayer.cpp:3849
-#, fuzzy
+#: src/localplayer.cpp:3847
 msgid "You see "
-msgstr "Vi dobijete %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4409,92 +4171,76 @@ msgid "Options:"
 msgstr "Opcije:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Prikaži verziju"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Prikaži ovu pomoć"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Prijava s ovim korisničkim imenom"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Prijava s ovom lozinkom"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Ulaz s tim likom"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -U --username    : Prijava s ovim korisničkim imenom"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -P --password    : Prijava s ovom lozinkom"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -u --skip-update : Preskoči preuzimanje ažuriranja"
+msgstr ""
 
 #: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Preskoči preuzimanje ažuriranja"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Direktorij iz kojeg se učitavaju podaci igre"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Onemogući OpenGL za ovu sesiju"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4508,133 +4254,819 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Snaga"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Snaga %+d"
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Okretnost"
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Okretnost %+d"
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Spretnost"
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Spretnost %+d"
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalnost"
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalnost %+d"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligencija"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencija %+d"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Snaga volje:"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Snaga Volje %+d"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/chathandler.cpp:128
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Ceh, ustanovljen."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vi ste mrtvi."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Niste više tako živi."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Kraj Igre!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 "Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Predpostavljam da ovo nije išlo previše dobro."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Želite li svoju imovinu identificirati?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Uništen."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Izgleda da su vam predali vašu glavu."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s želi trgovati s vama, prihvaćate li?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Otkazano trgovanje."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Trgovanje je završeno."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Snaga"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Okretnost"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Spretnost"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalnost"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligencija"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
 #: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
 msgid "You Died"
-msgstr "Umrli ste"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
 msgid "Not logged in."
-msgstr "Već prijavljeni"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
@@ -4645,9 +5077,8 @@ msgid "Invalid name."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "Korisničko ime već postoji"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
@@ -4662,14 +5093,12 @@ msgid "Invalid gender."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Podaci lika su u redu"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Podaci lika su u redu"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -4680,31 +5109,18 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nepoznata greška"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
 msgid "Player deleted."
-msgstr "Lik izbrisan."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
 msgid "Selection out of range."
-msgstr "Odaberi količinu predmeta za razmjenu."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Nepoznata greška"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -4717,28 +5133,25 @@ msgid "Topic: %s"
 msgstr "Tema: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
 msgid "Players in this channel:"
-msgstr "Igrač pogađa Čudovište"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
 msgid "Error joining channel."
-msgstr "Naredba: /join <channel>"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
 msgid "Listing channels."
-msgstr "Zahtjev za pridruživanje kanalu %s."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s se pridružio partiji."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
@@ -4756,13 +5169,8 @@ msgid "%s has kicked %s."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Nepoznata naredba."
-
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Ceh, ustanovljen."
+msgstr ""
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
@@ -4781,48 +5189,36 @@ msgid "Failed to promote member."
 msgstr "Neuspješno promicanje člana."
 
 #: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
 msgid "Wrong magic_token."
-msgstr "Pogrešan magični_simbol"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
 msgid "Already logged in."
-msgstr "Već prijavljeni"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
 msgid "Account banned."
-msgstr "Račun je istekao"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
 msgid "New password incorrect."
-msgstr "Nova lozinka je netočna"
-
-#: src/net/manaserv/loginhandler.cpp:127
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Stara lozinka je netočna"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Račun nije priključen. Molimo prvo se prijavite."
 
 #: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "Nova e-mail adresa netočna"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "Stara e-mail adresa netočna"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
 msgid "The new email address already exists."
-msgstr "Nova E-mail Adresa već postoji."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -4830,38 +5226,32 @@ msgid ""
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
 msgid "Client version is too old."
-msgstr "Verzija klijenta je prestara"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
 msgid "Wrong username or password."
-msgstr "Pogrešno korisničko ime ili lozinka"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
 msgid "Account banned"
-msgstr "Račun je istekao"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
 msgid "Wrong username, password or email address."
-msgstr "Pogrešno korisničko ime, lozinka ili email adresa"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
 msgid "Username already exists."
-msgstr "Korisničko ime već postoji"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
 msgid "Email address already exists."
-msgstr "Email adresa već postoji"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -4877,9 +5267,9 @@ msgid "%s joined the party."
 msgstr "%s se pridružio partiji."
 
 #: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s je odbio vašu pozivnicu."
+msgstr ""
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -4889,24 +5279,11 @@ msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s želi trgovati s vama, prihvaćate li?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Trgovanje s %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Otkazano trgovanje."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Trgovanje je završeno."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Šut nije uspio!"
@@ -4924,14 +5301,12 @@ msgid "Unable to sell."
 msgstr "Nije moguće prodati."
 
 #: src/net/tmwa/buysellhandler.cpp:140
-#, fuzzy
 msgid "Unable to sell while trading."
-msgstr "Nije moguće prodati."
+msgstr ""
 
 #: src/net/tmwa/buysellhandler.cpp:143
-#, fuzzy
 msgid "Unable to sell unsellable item."
-msgstr "Nije moguće prodati."
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:109
 #, c-format
@@ -4964,39 +5339,32 @@ msgid "Luck %+d"
 msgstr "Sreća %+d"
 
 #: src/net/tmwa/generalhandler.cpp:140
-#, fuzzy
 msgid "Authentication failed."
-msgstr "Autentikacija nije uspjela"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:143
-#, fuzzy
 msgid "No servers available."
-msgstr "Nema dostupnih poslužitelji"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:147
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "Netko drugi pokušava korištiti ovaj račun"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:150
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "Ovaj korisnički račun je već prijavljen"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:153
-#, fuzzy
 msgid "Speed hack detected."
-msgstr "Otkrit brzi hack"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:156
-#, fuzzy
 msgid "Duplicated login."
-msgstr "Dvostruka prijava"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:159
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "Nepoznata pogreška veze"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -5007,63 +5375,55 @@ msgid "Luck"
 msgstr "Sreća"
 
 #: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
 msgid "Defense"
-msgstr "Obrana:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
 msgid "M.Attack"
-msgstr "M.Napad:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
 msgid "M.Defense"
-msgstr "M.Obrana:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Accuracy"
-msgstr "% Preciznost:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Evade"
-msgstr "% Izbjegavanje:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:275
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Critical"
-msgstr "Kritični Udarac"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
 msgid "Attack Delay"
-msgstr "Napad %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
 msgid "Walk Delay"
-msgstr "Napad %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:280
-#, fuzzy
 msgid "Attack Range"
-msgstr "Čudovište pogađa Igrača"
+msgstr ""
 
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #: src/net/tmwa/network.cpp:356
-#, fuzzy
 msgid "Unable to resolve host \""
-msgstr "Nije moguće prodati."
+msgstr ""
 
 #: src/net/tmwa/network.cpp:426
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "Spajanje na poslužitelja karti..."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
@@ -5114,1140 +5474,3 @@ msgstr "Mana %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
-
-#, fuzzy
-#~ msgid "Cannot use this ID."
-#~ msgstr "Ne mogu koristiti ovaj ID"
-
-#, fuzzy
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Nepoznata greška"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
-
-#, fuzzy
-#~ msgid "Wrong name."
-#~ msgstr "Pogrešan magični_simbol"
-
-#~ msgid "Character deleted."
-#~ msgstr "Lik izbrisan."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Neuspješno brisanje znaka."
-
-#~ msgid "Strength:"
-#~ msgstr "Snaga:"
-
-#~ msgid "Agility:"
-#~ msgstr "Okretnost:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalnost:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencija:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Spretnost:"
-
-#~ msgid "Luck:"
-#~ msgstr "Sreća:"
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Šapat nije mogao biti poslan, korisnik je offline."
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
-
-#, fuzzy
-#~ msgid "MVP player."
-#~ msgstr "Igrač"
-
-#, fuzzy
-#~ msgid "MVP player: "
-#~ msgstr "Igrač"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanali nisu podržani!"
-
-#, fuzzy
-#~ msgid "Game"
-#~ msgstr "Ime"
-
-#, fuzzy
-#~ msgid "Request to quit denied!"
-#~ msgstr "Zahtjev za Trgovanje"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Prikaži ovu pomoć."
-
-#, fuzzy
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Pozovite igrače na vašu partiju"
-
-#, fuzzy
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Napustite partiju u kojoj ste"
-
-#, fuzzy
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Naredba: /invite <nick>"
-
-#, fuzzy
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Ova naredba poziva <nick> na partiju sa vama."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Naredba: /leave"
-
-#, fuzzy
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Ova naredba postavlja temu za <message>."
-
-#, fuzzy
-#~ msgid "You are already in guild."
-#~ msgstr "Pogreška pri ustanovljavanju ceha."
-
-#, fuzzy
-#~ msgid "Unknown server response."
-#~ msgstr "Nepoznata greška"
-
-#, fuzzy
-#~ msgid "Guild name: %s"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild master: %s"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild level: %d"
-#~ msgstr "Nivo: %d"
-
-#, fuzzy
-#~ msgid "Average level: %d"
-#~ msgstr "Najviša razina"
-
-#, fuzzy
-#~ msgid "Guild exp: %d"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Ceh, ustanovljen."
-
-#, fuzzy
-#~ msgid "Guild castle: %s"
-#~ msgstr "Ceh, ustanovljen."
-
-#, fuzzy
-#~ msgid "User is now part of your guild."
-#~ msgstr "%s je sada član vaše partije."
-
-#, fuzzy
-#~ msgid "You have left the guild."
-#~ msgstr "Napustili ste partiju."
-
-#, fuzzy
-#~ msgid "%s has left your guild."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#, fuzzy
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s je sada član vaše partije."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Pozovite igrače na vašu partiju"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Napustite partiju u kojoj ste"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Ova naredba poziva <nick> na partiju sa vama."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Naredba: /item <policy>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr ""
-#~ "Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
-
-#~ msgid "Command: /item"
-#~ msgstr "Naredba: /item"
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Naredba: /exp <policy>"
-
-#~ msgid "Command: /exp"
-#~ msgstr "Naredba: /exp"
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Dijeljenje predmeta je omogućeno.moguće."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Dijeljenje predmeta je onemogućeno."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Dijeljenje predmeta nije moguće."
-
-#, fuzzy
-#~ msgid "Item sharing unknown."
-#~ msgstr "Dijeljenje predmeta je omogućeno.moguće."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Neuspješno korištenje predmeta."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Nije moguće opremiti."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Račun nije pronađen. Molimo, ponovno se prijavite."
-
-#, fuzzy
-#~ msgid "New password too short."
-#~ msgstr "Nova lozinka je prekratka"
-
-#, fuzzy
-#~ msgid "Unregistered ID."
-#~ msgstr "Neregistriran ID"
-
-#, fuzzy
-#~ msgid "Wrong password."
-#~ msgstr "Pogrešna lozinka"
-
-#, fuzzy
-#~ msgid "Account expired."
-#~ msgstr "Račun je istekao"
-
-#, fuzzy
-#~ msgid "Rejected from server."
-#~ msgstr "Odbijeno od poslužitelja"
-
-#, fuzzy
-#~ msgid "Client too old."
-#~ msgstr "Verzija klijenta je prestara"
-
-#, fuzzy
-#~ msgid "This user name is already taken."
-#~ msgstr "Ovo korisničko ime je već zauzeto"
-
-#, fuzzy
-#~ msgid "Username permanently erased."
-#~ msgstr "Korisničko ime već postoji"
-
-#~ msgid "Could not create party."
-#~ msgstr "Nije se mogla napraviti partija."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Partija je uspješno kreirana."
-
-#, fuzzy
-#~ msgid "%s has joined your party."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s je već član partije."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s je odbio vašu pozivnicu."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s je sada član vaše partije."
-
-#~ msgid "You have left the party."
-#~ msgstr "Napustili ste partiju."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Nepoznati član pokušava reći: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Ubacite žeton za nastavak."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Niste još mrtvi. Samo se odmarate."
-
-#~ msgid "You are no more."
-#~ msgstr "Nema vas više."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Prestali ste postojati."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Ukočili ste se."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Lišeni života, počivate u miru."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Da niste bili toliko animirani sad bi podizali tratinčice."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Vaši metabolički procesi su sad povijest."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Pali ste s grančice."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Vi ste šutirali sić."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Vi ste bivši igrač."
-
-#~ msgid "Message"
-#~ msgstr "Poruka"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
-#~ "zdravlje."
-
-#, fuzzy
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
-#~ "zdravlje."
-
-#, fuzzy
-#~ msgid "You picked up %s."
-#~ msgstr "Pokupili ste "
-
-#, fuzzy
-#~ msgid "You spent %s."
-#~ msgstr "Vi dobijete %s."
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Prvo se opremite strijelama."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Neuspjela razmjena!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Neuspjelo korištenje emotea!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Neuspjelo sjedanje!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Neuspjelo stvaranje lika!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Neuspjelo priključivanje družini!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Neuspjelo vikanje!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Još nisi dosegao/la dovoljno visok nivo!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Nedovoljno zdravlja!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Nedovoljno SP-a!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Nemaš podsjetnika!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Ne možeš to učiniti sad!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Čini se da trebate više novca... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Ne možeš koristiti tu vještinu s tim oružjem!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Trebaš još jedan crveni dragulj!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Trebaš još jedan plavi dragulj!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Nosiš previše predmeta da bi učinio to!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Ha? Što je to?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Skok nije uspio..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Krađa nije uspjela..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Otrov nije uspio..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Trgovanje nije moguće. Trgovački partner je predaleko."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Trgovanje nije moguće. Lik ne postoji."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Trgovanje otkazano zbog nepoznatih razloga."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Trgujte: Vi i %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Trgovanje s %s otkazano."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
-
-#, fuzzy
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Nivo: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Pomakni Ulijevo"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Podaci lika su u redu"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Smajlić"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Razmijeni se s %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Napadni %s@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Upotrijebi@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Otkaži@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Preuzmi@@"
-
-#, fuzzy
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Zanemari %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignoriraj %s@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Upotrijebi@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Potpuno ignoriraj %s@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Pozovite korisnike na partiju"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Šutni igrača@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Upotrijebi@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|Napadni %s@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Šutni igrača@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Dodaj ime u chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Otkaži@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Pokupi %s@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Dudaj u chat@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Upotrijebi@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Odaberite OK"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Pomoć --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Prikaži ovu pomoć"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Prikaži ime karte"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Recite nešto o sebi"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Očisti ovaj prozor"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Pošaljite privatnu poruku korisniku"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Alias za msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Alias za msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Čini karticu za privatne poruke s drugim korisnikom"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Alias od query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Zatvara karticu za šaptaje"
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Zanemari %s@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Prikaži sve javne kanale"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Pridruži se ili napravi kanal"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Napravi novu partiju"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Napravi novu partiju"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Pozovite korisnike na partiju"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Globalna obavijest (samo GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Zatvara karticu za šaptaje"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Pošaljite privatnu poruku korisniku"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Za više informacija, utipkajte /pomoć <naredba>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Naredba: /pomoć"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Naredba: /pomoć <naredba>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Ova naredba prikazuje pomoć pri <naredba>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Command: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** dostupno samo za GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr "Ova naredba šalje poruku <msg> svim igračima trenutno online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Naredba: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Ova naredba briše chat log prethodnog chata."
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Naredba: /item <policy>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Ova naredba prikazuje broj igrača trenutno online."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Naredba: /join <channel>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Ova naredba vas unaša u <channel>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Ako <channel> ne postoji, onda je napravljen."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Ova naredba prikazuje listu svih kanala."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Naredba: /me <message>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Ova naredba govori drugima da vi (radite) <msg>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Naredba: /msg <nick> <message>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Naredba: /whisper <nick> <message>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Naredba: /w <nick> <message>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Ova naredba šalje tekst <message> za <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Naredba: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Naredba: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Naredba: /w <nick> <message>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Naredba: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Ova naredba postavlja temu za <message>."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Naredba: /create <ime-partije>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Naredba: /create <ime-partije>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Naredba: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Naredba: /present"
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Naredba: /toggle <state>"
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Naredba: /toggle"
-
-#~ msgid "Command: /where"
-#~ msgstr "Naredba: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Ova naredba prikazuje naziv trenutne karte."
-
-#~ msgid "Command: /who"
-#~ msgstr "Naredba: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Ova naredba prikazuje broj igrača trenutno online."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Upišite /help za listu svih naredbi."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Detalji Čestica"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Efekti okruženja"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Prečica za Ispoljavanje emocija %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Igrač pogađa Čudovište"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Tema: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Ime: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Prozor Minikarte"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Započni snimanje chat-a u eksternoj datoteci"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Naredba: /record <filename>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr "Ova naredba započinje snimanje chat log-a u datoteku <filename>."
-
-#~ msgid "Command: /record"
-#~ msgstr "Naredba: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Ova naredba završava sesiju snimanja."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Prisutnost zapisana u evidentni dnevnik."
-
-#~ msgid "Finishing recording."
-#~ msgstr "Završavanje snimanja."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Trenutno ne snima."
-
-#~ msgid "Already recording."
-#~ msgstr "Već se snima."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Započinjanje snimanja..."
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Neuspjeli početak snimanja."
-
-#~ msgid "Recording..."
-#~ msgstr "Snimanje..."
-
-#~ msgid "Stop recording"
-#~ msgstr "Prestanak snimanja"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Pronađi Put do Miša"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Novac: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Zadatak:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Nivo: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Partija je uspješno kreirana."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
-
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
-
-#~ msgid "Sound"
-#~ msgstr "Zvuk"
-
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Pristup odbijen"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Nepoznata greška pri odabiru lika"
-
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
-
-#~ msgid "Willpower:"
-#~ msgstr "Snaga volje:"
-
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Trgovanje s %s"
-
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Šapat"
-
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Budi prijatelj %s@@"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Zanemareno"
-
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Potpuno ignoriraj %s@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Pozovi %s da se pridrži tvom cehu@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
-
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Govori S %s@@"
-
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Šutni čudovište@@"
-
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Pokupi"
-
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Ne mogu poslati prazan chat!"
-
-#~ msgid "Text Shadow"
-#~ msgstr "Sjena Teksta"
-
-#~ msgid "Text Outline"
-#~ msgstr "Obris Teksta"
-
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Progress Bar Oznake"
-
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Preskup predmet"
-
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Predmet je opremljen"
-
-#~ msgid "GM"
-#~ msgstr "GM"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Unknown Item Type"
-#~ msgstr "Nepoznat Tip Predmeta"
-
-#~ msgid "Generics"
-#~ msgstr "Generički"
-
-#~ msgid "Hats"
-#~ msgstr "Šeširi"
-
-#~ msgid "Shirts"
-#~ msgstr "Košulje"
-
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 Ručno Oružje"
-
-#~ msgid "Pants"
-#~ msgstr "Hlače"
-
-#~ msgid "Shoes"
-#~ msgstr "Cipele"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 Ručno Oružje"
-
-#~ msgid "Shields"
-#~ msgstr "Štitovi"
-
-#~ msgid "Rings"
-#~ msgstr "Prstenovi"
-
-#~ msgid "Necklaces"
-#~ msgstr "Ogrlice"
-
-#~ msgid "Arms"
-#~ msgstr "Naoružanje"
-
-#~ msgid "Ammo"
-#~ msgstr "Streljivo"
-
-#~ msgid "HP Bar"
-#~ msgstr "HP Bar"
-
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP Bar"
-
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP Bar"
-
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP Bar"
-
-#~ msgid "no"
-#~ msgstr "ne"
-
-#~ msgid "Buddy"
-#~ msgstr "Prijatelj"
-
-#~ msgid "Buddy List"
-#~ msgstr "Lista Prijatelja"
-
-#~ msgid "Description: %s"
-#~ msgstr "Opis: %s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "Učinak: %s"
-
-#~ msgid "New"
-#~ msgstr "Novi"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Nivo poslaČ %d"
-
-#~ msgid "Present: "
-#~ msgstr "Pokloniti: "
-
-#~ msgid "Quit Guild"
-#~ msgstr "Napusti Ceh"
-
-#~ msgid "Ok"
-#~ msgstr "U redu"
-
-#~ msgid "Recent:"
-#~ msgstr "Novije:"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Baci Testnu Čaroliju 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Baci Testnu Čaroliju 2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Baci Testnu Čaroliju 3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 Ručno Oružje"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Skini opremu@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Opremi@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Ispusti@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Razdvoji@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Pohrani@@"
-
-#~ msgid "Select Server"
-#~ msgstr "Odaberi poslužitelj"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "Neuspješno prebacivanje na "
-
-#~ msgid "windowed"
-#~ msgstr "uokvireno"
-
-#~ msgid "fullscreen"
-#~ msgstr "cijeli ekran"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "Vještina Misterije"
-
-#~ msgid "Weapons"
-#~ msgstr "Oružje"
-
-#~ msgid "Crafts"
-#~ msgstr "Obrti"
-
-#~ msgid "Stats"
-#~ msgstr "Statistika"
-
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#~ msgid "Cost"
-#~ msgstr "Cijena"
-
-#~ msgid "Attack:"
-#~ msgstr "Napad:"
-
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
-
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Preostali Bodovi Statusa: %d"
-
-#~ msgid "curl error "
-#~ msgstr "curl greška "
-
-#~ msgid " host: "
-#~ msgstr " domaćin: "
-
-#~ msgid "Buddys"
-#~ msgstr "Prijatelji"
-
-#~ msgid "Party Window"
-#~ msgstr "Prozor za Partiju"
-
-#~ msgid "Unarmed"
-#~ msgstr "Razoružan"
-
-#~ msgid "Knife"
-#~ msgstr "Nož"
-
-#~ msgid "Sword"
-#~ msgstr "Mač"
-
-#~ msgid "Staff"
-#~ msgstr "Motka"
-
-#~ msgid "Whip"
-#~ msgstr "Bič"
-
-#~ msgid "Bow"
-#~ msgstr "Luk"
-
-#~ msgid "Shooting"
-#~ msgstr "Gađanje"
-
-#~ msgid "Mace"
-#~ msgstr "Buzdovan"
-
-#~ msgid "Axe"
-#~ msgstr "Sjekira"
-
-#~ msgid "Craft"
-#~ msgstr "Zanat"
-
-#~ msgid "Unknown Skill"
-#~ msgstr "Nepoznata Vještina"
-
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " ne može biti stvoren, ali ne postoji! Izlaz."
-
-#~ msgid " video mode: "
-#~ msgstr " video način: "
-
-#~ msgid "Connecting to character server..."
-#~ msgstr "Spajanje na poslužitelja likova..."
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "Spajanje na poslužitelja korisnika..."
-
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias od napravi"
-
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Naredba: /new <ime-partije>"
-
-#~ msgid "Unnamed"
-#~ msgstr "Neimenovano"
-
-#~ msgid "Scroll radius"
-#~ msgstr "Polumjer klizanja"
-
-#~ msgid "Scroll laziness"
-#~ msgstr "Brzina klizanja"
diff --git a/po/hu.po b/po/hu.po
index 97331ec07..489ebc42c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,138 +1,126 @@
-# Hungarian translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2009-07-07 19:52+0000\n"
-"Last-Translator: Tatsukichi <artit91@gmail.com>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
-#, fuzzy
 msgid "Visible on map"
-msgstr "Látható nevek"
+msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
-#, fuzzy
+#: src/being.cpp:1519
 msgid "I"
-msgstr "Is"
+msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:908
-#, fuzzy
+#: src/client.cpp:909
 msgid "Connecting to server"
-msgstr "Csatlakozás a térkép szerverhez...."
+msgstr ""
 
-#: src/client.cpp:939
-#, fuzzy
+#: src/client.cpp:940
 msgid "Logging in"
-msgstr "Belépés"
+msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
-#, fuzzy
+#: src/client.cpp:1073
 msgid "Requesting characters"
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+msgstr ""
 
-#: src/client.cpp:1103
-#, fuzzy
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
-msgstr "Csatlakozás a térkép szerverhez...."
+msgstr ""
 
-#: src/client.cpp:1113
-#, fuzzy
+#: src/client.cpp:1114
 msgid "Changing game servers"
-msgstr "Szerver"
+msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
-#, fuzzy
+#: src/client.cpp:1194
 msgid "Password Change"
-msgstr "Jelszó:"
+msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email Change"
-msgstr "Változtatás"
+msgstr ""
 
-#: src/client.cpp:1214
-#, fuzzy
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
-msgstr "A tag előléptetése sikeres."
+msgstr ""
 
-#: src/client.cpp:1234
-#, fuzzy
+#: src/client.cpp:1235
 msgid "Unregister Successful"
-msgstr "Regisztráció megszüntetése"
+msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
-#, fuzzy, c-format
+#: src/client.cpp:1628
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Helytelen frissítési kiszolgáló: "
+msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -145,7 +133,7 @@ msgstr "Ismeretlen parancs."
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -153,164 +141,152 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:456
-#, fuzzy
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
-msgstr "A csapatnév hiányzik."
+msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:555
-#, fuzzy
+#: src/commandhandler.cpp:561
 msgid "friend"
-msgstr "Barát"
+msgstr ""
 
-#: src/commandhandler.cpp:560
-#, fuzzy
+#: src/commandhandler.cpp:566
 msgid "disregarded"
-msgstr "Semmibevett"
+msgstr ""
 
-#: src/commandhandler.cpp:565
-#, fuzzy
+#: src/commandhandler.cpp:571
 msgid "neutral"
-msgstr "Semleges"
+msgstr ""
 
-#: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#: src/commandhandler.cpp:590
+#, c-format
 msgid "Player already %s!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgstr ""
 
-#: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#: src/commandhandler.cpp:604
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Csapat létrehozása sikeres."
+msgstr ""
 
-#: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#: src/commandhandler.cpp:612
+#, c-format
 msgid "Player could not be %s!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
-#, fuzzy
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgstr ""
 
-#: src/commandhandler.cpp:654
-#, fuzzy
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgstr ""
 
-#: src/commandhandler.cpp:665
-#, fuzzy
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
-msgstr "Csapat létrehozása sikeres."
+msgstr ""
 
-#: src/commandhandler.cpp:667
-#, fuzzy
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
-msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
+msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
-#, fuzzy
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
-msgstr "Betűméret"
+msgstr ""
 
-#: src/commandhandler.cpp:1094
-#, fuzzy
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
-msgstr "Betűméret"
+msgstr ""
 
-#: src/commandhandler.cpp:1098
-#, fuzzy
+#: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr "Létrehozás"
+msgstr ""
 
-#: src/commandhandler.cpp:1100
-#, fuzzy
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr "Törlés"
+msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -321,107 +297,102 @@ msgstr ""
 "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
-#, fuzzy
+#: src/game.cpp:488
 msgid "Screenshot saved as "
-msgstr "Képernyőt mentettük a ~/ helyre"
+msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:523
-#, fuzzy
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
-msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
+msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1576
-#, fuzzy
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
-msgstr "Nem lehet betölteni a térképet"
+msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
 
-#: src/gui/beingpopup.cpp:118
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:124
+#, c-format
 msgid "Party: %s"
-msgstr "Csapat (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:132
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:138
+#, c-format
 msgid "Guild: %s"
-msgstr "Klánok"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:162
+#, c-format
 msgid "Comment: %s"
-msgstr "Parancs: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Chat Ablak"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
-msgstr "Mozgás felfelé"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Vétel"
 
@@ -435,7 +406,7 @@ msgstr "Ár: %s / Teljes: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -443,30 +414,30 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Kilépés"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -475,19 +446,19 @@ msgstr "Eladás"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -501,24 +472,22 @@ msgid "Account: %s"
 msgstr "Fiók: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Írd be az új Email címet kétszer:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "A felhasználónévnek legalább %d karakternek kell lennie."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "A felhasználónévnek legfeljebb %d karakternek kell lennie."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Az új email cím már foglalt."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -531,23 +500,22 @@ msgid "Password:"
 msgstr "Jelszó:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Írd be az új jelszót kétszer:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "A jelszónak legalább %d karakter hosszúnak kell lennie."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -577,14 +545,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Haj szín:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Haj stílus:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -643,82 +609,71 @@ msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Email cím módosírása"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Hibás jelszó"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Karakter törlése sikertelen."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Hibás jelszó"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Törlés"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Bezár"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Szint: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Alapértelmezett"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Barát"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Zöld: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Kék: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "alacsony"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hiperlink"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -729,30 +684,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Dobófegyver"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Szivárvány"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Szivárvány"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Szivárvány"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -760,12 +711,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:606
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d játékos van a közeledben."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -778,63 +729,54 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
-#, fuzzy
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
-msgstr "Tiltott"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Térkép"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Mozgás balra"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Következő"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Téma: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Név: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "Minitérkép Ablak"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Egyéni kurzor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Sebzéskor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Effektek"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -866,51 +808,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Effektek"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Mozgás balra"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Játékost Kijelöl"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Játékost Kijelöl"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Játékost Kijelöl"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Játékost Kijelöl"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Támadás %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Minitérkép Ablak"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -919,9 +854,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Kritikális ütéskor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -944,37 +878,35 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Bezár"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Előző"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Következő"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -983,7 +915,7 @@ msgid "Help"
 msgstr "Súgó"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Táska"
 
@@ -996,51 +928,47 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:116
-#, fuzzy
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:122
-#, fuzzy
 msgid "na"
-msgstr ":"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:123
-#, fuzzy
 msgid "az"
-msgstr ":"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
-#, fuzzy
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
-msgstr "Eldob"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -1049,17 +977,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Eldob"
@@ -1097,107 +1025,103 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Ismeretlen hiba"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Súly: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Sztátusz Ablak"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Alaphelyzet"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Alaphelyzet"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Szint: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Ár: %s / Teljes: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1206,9 +1130,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Bezár"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1218,7 +1141,7 @@ msgstr ""
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Szerver:"
@@ -1228,9 +1151,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Felhasználónév megjegyzése"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1241,51 +1163,46 @@ msgid "Register"
 msgstr "Regisztráció"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Szerver"
+msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr "Súly: "
+msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr "Sérüléskor"
+msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
-#, fuzzy
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr "Státusz"
+msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1302,19 +1219,17 @@ msgid "Submit"
 msgstr "Küldés"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
-msgstr "Szálfegyver"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Következő"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1334,384 +1249,340 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Pénz: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Nem használ"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
-msgstr "Privát üzenet"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
-#, fuzzy
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr "Barát"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
-#, fuzzy
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
-msgstr "Semmibevett"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
-msgstr "Tiltott"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Teljesen letiltod %s-t@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
-#, fuzzy
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr "alacsony"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
-#, fuzzy
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
-msgstr "Email cím módosírása"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
-#, fuzzy
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
-msgstr "/party > Felhasználó csapatba hívása"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
-#, fuzzy
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
-msgstr "@@admin-kick|Játékos kirúgása@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
-#, fuzzy
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
-msgstr "@@admin-kick|Játékos kirúgása@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
-#, fuzzy
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
-msgstr "Változtatás"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
-#, fuzzy
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
-msgstr "/party > Felhasználó csapatba hívása"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:238
-#, fuzzy
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr "Kirúgás sikertelen!"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
-#, fuzzy
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
-msgstr "A név mutatása"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
-#, fuzzy
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr "Eladás"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
-#, fuzzy
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
-msgstr "@@attack|%s megtámadása@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:311
-#, fuzzy
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
-msgstr "@@attack|%s megtámadása@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:314
-#, fuzzy
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
-#, fuzzy
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:476
-#, fuzzy
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr "Felvesz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
-#, fuzzy
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
-#, fuzzy
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr "Felhasználónév megjegyzése"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
-#, fuzzy
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
-msgstr "Felhasználónév megjegyzése"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
-msgstr "Kijelölt fül"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
-msgstr "Kijelölt fül"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
-#, fuzzy
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
-msgstr "Felhasználónév megjegyzése"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:575
-#, fuzzy
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:580
-#, fuzzy
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
-msgstr "Üzletelés Engedélyezése/Tiltása"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Nagy"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:744
-#, fuzzy
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
-msgstr "Változtatás"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
-#, fuzzy
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
-#, fuzzy
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
-#, fuzzy
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
-#, fuzzy
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
-#, fuzzy
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
-msgstr "Raktároz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
-#, fuzzy
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr "Eldob"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
-#, fuzzy
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
-msgstr "Magához vesz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
-#, fuzzy
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
-msgstr "Magához vesz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
-#, fuzzy
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
-msgstr "Magához vesz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
-#, fuzzy
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Alapértelmezett"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
-#, fuzzy
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr "Mozgás felfelé"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
-#, fuzzy
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
-msgstr "Mozgás lefelé"
-
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:56
 msgid "Switch server"
 msgstr "Szerver változtatása"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Karakter változtatása"
 
@@ -1747,70 +1618,64 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:228
-#, fuzzy
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
-msgstr "Válassz szervert"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:239
-#, fuzzy
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Válassz szervert"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
-#, fuzzy
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
-msgstr "Szerver:"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
-#, fuzzy
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
-msgstr "Csatlakozás…"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-#, fuzzy
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
-msgstr "Egyéni kurzor"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
-#, fuzzy
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
-msgstr "Várakozás a szerverre"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1828,14 +1693,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Joystick engedélyezése"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Joystick engedélyezése"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1854,9 +1717,8 @@ msgid "Music volume"
 msgstr "Zene hangereje"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Nincs szöveg"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1879,9 +1741,8 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Parancs: /who"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1912,9 +1773,8 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Üzenet"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1925,38 +1785,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Privátok fülekbe tétele"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
-#, fuzzy
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:105
-#, fuzzy
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:108
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "A név mutatása"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:111
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Következő Chat Fül"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1965,9 +1825,8 @@ msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Típus: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1989,42 +1848,33 @@ msgid "Spectrum"
 msgstr "Színkép"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Várakozás "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Vörös: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Zöld: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Kék: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
@@ -2058,9 +1908,8 @@ msgid "Assign"
 msgstr "Hozzárendel"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Hozzárendel"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2070,336 +1919,368 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
-#, fuzzy
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr "A név mutatása"
+msgstr ""
 
-#: src/gui/setup_other.cpp:67
-#, fuzzy
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr "Karakter felett"
+msgstr ""
 
-#: src/gui/setup_other.cpp:70
-#, fuzzy
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
-msgstr "Kijelölt"
+msgstr ""
 
-#: src/gui/setup_other.cpp:73
-#, fuzzy
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
-msgstr "Kijelölt"
+msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
-msgstr "Játékos"
+msgstr ""
 
-#: src/gui/setup_other.cpp:106
-#, fuzzy
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
-msgstr "A név mutatása"
+msgstr ""
 
-#: src/gui/setup_other.cpp:109
-#, fuzzy
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
-msgstr "Joystick engedélyezése"
+msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
-#, fuzzy
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
-msgstr "Üzenet"
+msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
-#, fuzzy
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_other.cpp:130
-#, fuzzy
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
-#, fuzzy
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
-msgstr "Üzletelés Engedélyezése/Tiltása"
+msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
-#, fuzzy
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_other.cpp:154
-#, fuzzy
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
-msgstr "Joystick engedélyezése"
+msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
-#, fuzzy
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
-msgstr "Nem tudod megvenni."
+msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
-#, fuzzy
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
-msgstr "Háttér"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Játékosok"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Látható nevek"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Kapcsolat"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Semleges"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Barát"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Semmibevett"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Tiltott"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Privátok fülekbe tétele"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "A név mutatása"
-
-#: src/gui/setup_players.cpp:267
-msgid "Players"
-msgstr "Játékosok"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:292
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_players.cpp:315
-#, fuzzy
-msgid "Show level"
-msgstr "A név mutatása"
-
-#: src/gui/setup_players.cpp:319
-#, fuzzy
-msgid "Show own name"
-msgstr "A név mutatása"
-
-#: src/gui/setup_players.cpp:323
-#, fuzzy
-msgid "Target dead players"
-msgstr "Játékost Kijelöl"
-
-#: src/gui/setup_players.cpp:327
-#, fuzzy
-msgid "Secure trades"
-msgstr "Üzlet elfogadása"
-
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
-msgid "Unsecure chars in names"
-msgstr ""
-
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Látható nevek"
-
-#: src/gui/setup_players.cpp:341
-#, fuzzy
-msgid "Show statuses"
-msgstr "A név mutatása"
-
-#: src/gui/setup_theme.cpp:105
-#, fuzzy
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
-msgstr "Apró"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:106
-#, fuzzy
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
-msgstr "Kicsi"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:107
-#, fuzzy
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
-msgstr "Közepes"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:108
-#, fuzzy
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
-msgstr "Nagy"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
-msgstr "Effektek"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:146
-#, fuzzy
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
-msgstr "Súgó"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:147
-#, fuzzy
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
-msgstr "Üzlet elfogadása"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_theme.cpp:281
-#, fuzzy
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
-msgstr "Változtatás"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 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."
 
@@ -2408,14 +2289,12 @@ msgid "Software"
 msgstr ""
 
 #: src/gui/setup_video.cpp:195
-#, fuzzy
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:196
-#, fuzzy
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:223
 msgid "No text"
@@ -2453,147 +2332,114 @@ msgstr "közepes"
 msgid "max"
 msgstr "max."
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:294
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Kapcsolat"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Értesítés tárgy felvételkor"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "Chat-en belül"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "Karakter felett"
 
-#: src/gui/setup_video.cpp:305
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Joystick engedélyezése"
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Joystick engedélyezése"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
+#: src/gui/setup_video.cpp:302
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
 #: src/gui/setup_video.cpp:315
-#, fuzzy
-msgid "FPS limit:"
-msgstr "FPS Limit:"
-
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
-#, fuzzy
-msgid "Alt FPS limit: "
-msgstr "FPS Limit:"
-
-#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Videó"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
-#: src/gui/setup_video.cpp:337
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Effektek részletessége"
+msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nem"
+msgstr ""
 
-#: src/gui/setup_video.cpp:511
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
+msgstr ""
 
-#: src/gui/setup_video.cpp:517
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
+msgstr ""
 
-#: src/gui/setup_video.cpp:528
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Átállás teljes képernyőre"
+msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:541
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "OpenGL átállítása"
+msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "A képernyő felbontása megváltozott"
+msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Effektek beállítása megváltozott."
+msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
@@ -2622,14 +2468,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s üzletelni akar veled. Te akarsz vele?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2640,31 +2487,31 @@ msgid "Up"
 msgstr "Fejleszt"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Képesség pontok: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Képesség pontok: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Képességek"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Szint: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Szint: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Klán"
 
@@ -2674,9 +2521,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Klán létrehozva."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2688,23 +2535,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Klán létrehozása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Biztos, hogy ki szeretne lépni?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Csapat"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Felhasználó csapatba hívása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2712,9 +2558,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Felhasználó csapatba hívása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2726,75 +2571,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Biztos, hogy ki szeretne lépni?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Támadás"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Támadás"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Tiltott"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Karakter létrehozása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Felhasználó meghívása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Csapatba hívást elfogadta %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Csapatba hívást elutasította %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Csapatba hívást elfogadta %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Csapatba hívást elutasította %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Hiba a klán létrehozása közben."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2802,43 +2642,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Klán"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Válassz szervert"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Csapatba hívtak, de neked van csapatod."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s behívott %s csapatába."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Ajánlat elfogadása"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s a csapatába hívott."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s behívott %s csapatába."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2859,534 +2694,513 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Csapat"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Válassz szervert"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Mozgás balra"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Mozgás balra"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Támadás"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Karakter változtatása"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Karakter változtatása"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Karakter változtatása"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Billentyűzet"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Élet:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "TP:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Varázserő:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Munka:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#, c-format
 msgid "Character points: %d"
-msgstr "Karakter statok rendben"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:267
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Szint: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#: src/gui/statuswindow.cpp:323
+#, c-format
 msgid "Correction points: %d"
-msgstr "Képesség pontok: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Mozgás balra"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Üzletelés engedélyezése"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Mozgás balra"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Általános"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Mágia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Mágia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Parancs: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Mágia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Parancs: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Játékost Kijelöl"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Max. szint"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "A név mutatása"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3411,9 +3225,9 @@ msgid "Trade: You"
 msgstr "Üzlet: Te"
 
 #: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "Kapott tárgy: %s."
+msgstr ""
 
 #: src/gui/tradewindow.cpp:111
 msgid "You give:"
@@ -3423,48 +3237,47 @@ msgstr "Adott tárgyak:"
 msgid "Change"
 msgstr "Változtatás"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Nincs elég pénzed."
+
+#: src/gui/tradewindow.cpp:453
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Nincs elég pénzed."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Frissítés…"
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Játék"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
-#, fuzzy
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 próbáld meg később"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Kész"
 
@@ -3473,24 +3286,20 @@ msgid "Being"
 msgstr "Nevek"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Barát"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Semmibevett"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Tiltott"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM név"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3509,23 +3318,20 @@ msgid "NPCs"
 msgstr "Gépjátékos neve"
 
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Sérüléskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Csapat"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Klán"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3540,42 +3346,36 @@ msgid "Exp Notification"
 msgstr "Tapasztalat szerzésekor"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Sérüléskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Sebzéskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Sérüléskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Ismeretlen játékos neve"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Sebzéskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Sebzéskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3586,29 +3386,24 @@ msgid "Misses"
 msgstr "Ha nincs találat."
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Kijelölt fül"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Kijelölt"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Kijelölt"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Kijelölt"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Kijelölt fül"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3619,9 +3414,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Sérüléskor"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3635,23 +3429,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3717,6 +3511,7 @@ msgstr ""
 "Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
@@ -3751,9 +3546,13 @@ msgid "Global announcement from %s:"
 msgstr "Globális bejelentés (%s) :"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s mondja: "
+msgstr ""
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3776,35 +3575,28 @@ msgid "This command closes the current whisper tab."
 msgstr "Ez a parancs bezárja az aktuális privát fület."
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Parancs: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Parancs: /item <szabály>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
-"Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
-"fájlba."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Chat Ablak"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3819,9 +3611,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Hangulatjel"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3856,9 +3647,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Gyorsmenü"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3881,25 +3671,22 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Ok Kiválasztása"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Változtatás"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Válassz szervert"
+msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
-msgstr "Raktár"
+msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -3924,9 +3711,8 @@ msgid "Target & Attack"
 msgstr "Kijelöl és Támad"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Mozgás balra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3953,9 +3739,8 @@ msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Legközelebbit Kijelöl"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3990,14 +3775,12 @@ msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Email cím módosírása"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Gyorsmenü %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -4055,43 +3838,36 @@ msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Képességek Ablak"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Sztátusz Ablak"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Beállítások Ablak"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Ablakok Elrejtése"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Sztátusz Ablak"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Parancs: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Chat Ablak"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4102,14 +3878,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Előző Chat Fül"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Következő Chat Fül"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4171,19 +3945,16 @@ msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Következő Chat Fül"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
-#, fuzzy
 msgid "Previous chat line"
-msgstr "Előző Chat Fül"
+msgstr ""
 
 #: src/keyboardconfig.cpp:282
-#, fuzzy
 msgid "Next chat line"
-msgstr "Következő Chat Fül"
+msgstr ""
 
 #: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
@@ -4210,19 +3981,16 @@ msgid "Direct Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:296
-#, fuzzy
 msgid "Direct Down"
-msgstr "Mozgás lefelé"
+msgstr ""
 
 #: src/keyboardconfig.cpp:298
-#, fuzzy
 msgid "Direct Left"
-msgstr "Mozgás balra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:299
-#, fuzzy
 msgid "Direct Right"
-msgstr "Mozgás jobbra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
@@ -4257,33 +4025,28 @@ msgid "Use magic attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:317
-#, fuzzy
 msgid "Switch magic attack"
-msgstr "Karakter változtatása"
+msgstr ""
 
 #: src/keyboardconfig.cpp:319
-#, fuzzy
 msgid "Change move type"
-msgstr "Szerver"
+msgstr ""
 
 #: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:323
-#, fuzzy
 msgid "Change Attack Type"
-msgstr "Kijelöl és Támad"
+msgstr ""
 
 #: src/keyboardconfig.cpp:325
-#, fuzzy
 msgid "Change Follow mode"
-msgstr "Jelszó módosítása"
+msgstr ""
 
 #: src/keyboardconfig.cpp:327
-#, fuzzy
 msgid "Change Imitation mode"
-msgstr "Email cím módosírása"
+msgstr ""
 
 #: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
@@ -4294,9 +4057,8 @@ msgid "On / Off audio"
 msgstr ""
 
 #: src/keyboardconfig.cpp:333
-#, fuzzy
 msgid "Enable / Disable away mode"
-msgstr "Üzletelés Engedélyezése/Tiltása"
+msgstr ""
 
 #: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
@@ -4311,83 +4073,76 @@ msgid "Modifier key"
 msgstr ""
 
 #: src/keyboardconfig.cpp:411
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
+msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
-#, fuzzy
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
-msgstr "Nem tudod felvenni a tárgyat."
+msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
-#, fuzzy
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
-msgstr "A szerver tele van"
+msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
-#, fuzzy
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
-msgstr "Nem tudod felvenni a tárgyat."
+msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
-#, fuzzy, c-format
+#: src/localplayer.cpp:1441
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
-msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
-#, fuzzy
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
-msgstr "Az üzlet megszakadt."
+msgstr ""
 
-#: src/localplayer.cpp:3487
-#, fuzzy
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
-msgstr "Email cím módosírása"
+msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
-#, fuzzy
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
-msgstr "Az üzlet megszakadt."
+msgstr ""
 
-#: src/localplayer.cpp:3849
-#, fuzzy
+#: src/localplayer.cpp:3847
 msgid "You see "
-msgstr "Kapott tárgy: %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4410,93 +4165,76 @@ msgid "Options:"
 msgstr "Opciók:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Konfigurációs fájl használata"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Konfigurációs fájl használata"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Megmutatja a verziót"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Megmutatja ezt a súgót"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfigurációs fájl használata"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Bejelentkezés ezzel a felhasználónévvel"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Bejelentkezés ezzel a jelszóval"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Bejelentkezés ezzel a karakterrel"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Szerver neve vagy IP címe"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Bejelentkezési port"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : A frissítési szerver kijelölésére használjuk"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Válaszd ki az alapértelmezett szervert és karaktert"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update :  Frissítés átugrása"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Könyvtár ahonnan betöltöd a játékot"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL kikapcsolása erre az időszakra"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4510,82 +4248,495 @@ msgstr "Öröm volt veled üzletet kötni!"
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Erő"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Erő %+d"
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Mozgékonyság"
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Mozgékonyság %+d"
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ügyesség"
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Ügyesség %+d"
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Egészség"
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Egészség %+d"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligencia"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligencia %+d"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Akaraterő:"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Akaraterő: %+d"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Infó"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Klán létrehozva."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Meghaltál."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "A karaktered elvérzett a csatában."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Nem vagy már az élők sorában."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "A kaszás eljött érted, hogy elvigye a lelked."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Vége a játéknak!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4593,7 +4744,7 @@ msgstr ""
 "Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
 "került."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4601,45 +4752,317 @@ msgstr ""
 "A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
 "bizonyult."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Úgy látszik nem futottál túl gyorsan."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Meg akarod bánni a bűneid?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Kövesd a fényt az alagút végén."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Megöltek."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Kezedbe adták a fejed."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Sikolyok közepette kerültél a másvilágra."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s üzletelni akar veled. Te akarsz vele?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Az üzlet megszakadt."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Sikeres üzlet."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Erő"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Mozgékonyság"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ügyesség"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Egészség"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligencia"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
 msgid "Press OK to respawn."
-msgstr " Nyomj Ok-t a feléledéshez"
+msgstr ""
 
 #: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
 msgid "You Died"
-msgstr "Meghaltál."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
 msgid "Not logged in."
-msgstr "Már be van jelentkezve"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
@@ -4650,9 +5073,8 @@ msgid "Invalid name."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "A felhasználónév foglalt"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
@@ -4667,14 +5089,12 @@ msgid "Invalid gender."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Karakter statok rendben"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Karakter statok rendben"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -4685,31 +5105,18 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ismeretlen hiba"
-
 #: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Infó"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
 msgid "Player deleted."
-msgstr "Karakter törölve."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
 msgid "Selection out of range."
-msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Ismeretlen hiba"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -4722,28 +5129,25 @@ msgid "Topic: %s"
 msgstr "Téma: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
 msgid "Players in this channel:"
-msgstr "Sebzéskor"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
 msgid "Error joining channel."
-msgstr "Parancs: /join <csatorna>"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
 msgid "Listing channels."
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s csatlakozott a csapathoz."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
@@ -4761,13 +5165,8 @@ msgid "%s has kicked %s."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Ismeretlen parancs."
-
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Klán létrehozva."
+msgstr ""
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
@@ -4786,48 +5185,36 @@ msgid "Failed to promote member."
 msgstr "A tag előléptetése sikertelen."
 
 #: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
 msgid "Wrong magic_token."
-msgstr "Helytelen magic_token"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
 msgid "Already logged in."
-msgstr "Már be van jelentkezve"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
 msgid "Account banned."
-msgstr "A fiók lejárt"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
 msgid "New password incorrect."
-msgstr "Az új jelszó hibás"
-
-#: src/net/manaserv/loginhandler.cpp:127
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "A régi jelszó hibás"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
 
 #: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "Az új email cím hibás."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "A régi email cím hibás."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
 msgid "The new email address already exists."
-msgstr "Az új email cím már foglalt."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -4835,38 +5222,32 @@ msgid ""
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
 msgid "Client version is too old."
-msgstr "A kliens verziója túl régi"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
 msgid "Wrong username or password."
-msgstr "Hibás felhasználónév vagy jelszó"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
 msgid "Account banned"
-msgstr "A fiók lejárt"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
 msgid "Wrong username, password or email address."
-msgstr "Hibás felhasználónév, jelszó, vagy email cím"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
 msgid "Username already exists."
-msgstr "A felhasználónév foglalt"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
 msgid "Email address already exists."
-msgstr "Az email cím foglalt"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -4882,9 +5263,9 @@ msgid "%s joined the party."
 msgstr "%s csatlakozott a csapathoz."
 
 #: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s visszautasította a csapatba hívást."
+msgstr ""
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -4894,24 +5275,11 @@ msgstr "Elfogadod a bejövő üzleti ajánlatokat."
 msgid "Ignoring incoming trade requests."
 msgstr "Elutasítod a bejövő üzleti ajánlatokat."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s üzletelni akar veled. Te akarsz vele?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Üzlet Te és %s között"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Az üzlet megszakadt."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Sikeres üzlet."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Kirúgás sikertelen!"
@@ -4929,14 +5297,12 @@ msgid "Unable to sell."
 msgstr "Nem tudod eladni."
 
 #: src/net/tmwa/buysellhandler.cpp:140
-#, fuzzy
 msgid "Unable to sell while trading."
-msgstr "Nem tudod eladni."
+msgstr ""
 
 #: src/net/tmwa/buysellhandler.cpp:143
-#, fuzzy
 msgid "Unable to sell unsellable item."
-msgstr "Nem tudod felvenni a tárgyat."
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:109
 #, c-format
@@ -4969,39 +5335,32 @@ msgid "Luck %+d"
 msgstr "Szerencse %+d"
 
 #: src/net/tmwa/generalhandler.cpp:140
-#, fuzzy
 msgid "Authentication failed."
-msgstr "Azonosítás sikertelen"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:143
-#, fuzzy
 msgid "No servers available."
-msgstr "Nincs elérhető szerver"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:147
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "Valaki más megprobál belépni erre a fiókra"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:150
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "Ez a fiók már be van lépve"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:153
-#, fuzzy
 msgid "Speed hack detected."
-msgstr "Speed hack észlelve"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:156
-#, fuzzy
 msgid "Duplicated login."
-msgstr "Duplikált bejelentkezés"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:159
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "Ismeretlen kapcsolati hiba"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -5012,63 +5371,55 @@ msgid "Luck"
 msgstr "Szerencse"
 
 #: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
 msgid "Defense"
-msgstr "Fizikális védelem:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
 msgid "M.Attack"
-msgstr "Mágikus támadás:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
 msgid "M.Defense"
-msgstr "Mágikus védelem:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Accuracy"
-msgstr "Találati esély (%):"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Evade"
-msgstr "Kitérés (%):"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:275
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Critical"
-msgstr "Kritikális ütéskor"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
 msgid "Attack Delay"
-msgstr "Támadás %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
 msgid "Walk Delay"
-msgstr "Támadás %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:280
-#, fuzzy
 msgid "Attack Range"
-msgstr "Sérüléskor"
+msgstr ""
 
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #: src/net/tmwa/network.cpp:356
-#, fuzzy
 msgid "Unable to resolve host \""
-msgstr "Nem tudod eladni."
+msgstr ""
 
 #: src/net/tmwa/network.cpp:426
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "Csatlakozás a térkép szerverhez...."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
@@ -5119,1272 +5470,3 @@ msgstr "Varázserő %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
-
-#, fuzzy
-#~ msgid "Cannot use this ID."
-#~ msgstr "Nem használhatod ez a nevet."
-
-#, fuzzy
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Ismeretlen hiba"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Nem tudod létrehozni a karaktert. Valószínű a neve használatban van."
-
-#, fuzzy
-#~ msgid "Wrong name."
-#~ msgstr "Helytelen magic_token"
-
-#~ msgid "Character deleted."
-#~ msgstr "Karakter törölve."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Karakter törlése sikertelen."
-
-#~ msgid "Strength:"
-#~ msgstr "Erő:"
-
-#~ msgid "Agility:"
-#~ msgstr "Mozgékonyság:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Egészség:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligencia:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Ügyesség:"
-
-#~ msgid "Luck:"
-#~ msgstr "Szerencse:"
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "A privát üzenet nem lett elküldve, mert a játékos nem elérhető."
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
-
-#, fuzzy
-#~ msgid "MVP player."
-#~ msgstr "Játékos"
-
-#, fuzzy
-#~ msgid "MVP player: "
-#~ msgstr "Játékos"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "A csatornák le vannak tiltva!"
-
-#, fuzzy
-#~ msgid "Game"
-#~ msgstr "Név"
-
-#, fuzzy
-#~ msgid "Request to quit denied!"
-#~ msgstr "Üzleti ajánlat"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Megmutatja ezt a súgót."
-
-#, fuzzy
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Játékos meghívása a csapatba"
-
-#, fuzzy
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Jelenlegi csapat elhagyása"
-
-#, fuzzy
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Valaki kirúgása a csapatból"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Parancs: /invite <név>"
-
-#, fuzzy
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Parancs: /leave"
-
-#, fuzzy
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#, fuzzy
-#~ msgid "You are already in guild."
-#~ msgstr "Hiba a klán létrehozása közben."
-
-#, fuzzy
-#~ msgid "Unknown server response."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#, fuzzy
-#~ msgid "Guild name: %s"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild master: %s"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild level: %d"
-#~ msgstr "Szint: %d"
-
-#, fuzzy
-#~ msgid "Average level: %d"
-#~ msgstr "Max. szint"
-
-#, fuzzy
-#~ msgid "Guild exp: %d"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Klán létrehozva."
-
-#, fuzzy
-#~ msgid "Guild castle: %s"
-#~ msgstr "Klán létrehozva."
-
-#, fuzzy
-#~ msgid "User is now part of your guild."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#, fuzzy
-#~ msgid "Unknown guild invite response."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#, fuzzy
-#~ msgid "You have left the guild."
-#~ msgstr "Kiléptél a csapatból."
-
-#, fuzzy
-#~ msgid "%s has left your guild."
-#~ msgstr "%s elhagyta a csapatot."
-
-#, fuzzy
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Játékos meghívása a csapatba"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Jelenlegi csapat elhagyása"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Valaki kirúgása a csapatból"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Parancs: /item <szabály>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Ez a parancs a tárgyak megosztását szabályozza a csapaton belül."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<szabály> lehet \"1\", \"yes\", \"true\" a tárgyak megosztásához, vagy "
-#~ "\"0\", \"no\", \"false\" a tárgyak megosztásának kikapcsolásához."
-
-#~ msgid "Command: /item"
-#~ msgstr "Parancs: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Ez a parancs megmutatja a csapat jelenlegi tárgymegosztási-szabályát."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Parancs: /exp <szabály>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Ez a parancs a tapasztalat megosztását szabályozza a csapaton belül."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<szabály> lehet \"1\", \"yes\", \"true\" a tapasztalat megosztásához, "
-#~ "vagy \"0\", \"no\", \"false\" a tapasztalat megosztásának kikapcsolásához."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Parancs: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Ez a parancs megmutatja a csapat jelenlegi tapasztalatmegosztási-"
-#~ "szabályát."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Tárgy megosztás engedélyezve."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Tárgy megosztás tiltva."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "A tárgy megosztás nem lehetséges."
-
-#, fuzzy
-#~ msgid "Item sharing unknown."
-#~ msgstr "Tárgy megosztás engedélyezve."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Tapasztalat megosztás engedélyezve."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Tapasztalat megosztás tiltva."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "A tapasztalat megosztás nem lehetséges."
-
-#, fuzzy
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Tapasztalat megosztás engedélyezve."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Nem tudod bevetni a tárgyat."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Nem tudod használni."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Fiók nem található. Kérem jelentkezzen be újra."
-
-#, fuzzy
-#~ msgid "New password too short."
-#~ msgstr "Az új jelszó túl rövid"
-
-#, fuzzy
-#~ msgid "Unregistered ID."
-#~ msgstr "Az ID nincs regisztrálva"
-
-#, fuzzy
-#~ msgid "Wrong password."
-#~ msgstr "Hibás jelszó"
-
-#, fuzzy
-#~ msgid "Account expired."
-#~ msgstr "A fiók lejárt"
-
-#, fuzzy
-#~ msgid "Rejected from server."
-#~ msgstr "Visszautasított a szerver"
-
-#, fuzzy
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Véglegesen kitiltottak a szerverről. Kérlek vedd fel a kapcsolatot a GM "
-#~ "csapattal."
-
-#, fuzzy
-#~ msgid "Client too old."
-#~ msgstr "A kliens verziója túl régi"
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Ki vagy tiltva a szerverről hátralévő idő a feloldásig %s\n"
-#~ "Kérlek vedd fel a kapcsolatot a GM csapattal."
-
-#, fuzzy
-#~ msgid "This user name is already taken."
-#~ msgstr "Ez a felhasználónév már foglalt."
-
-#, fuzzy
-#~ msgid "Username permanently erased."
-#~ msgstr "A felhasználónév foglalt"
-
-#~ msgid "Could not create party."
-#~ msgstr "Nem tudtad a csapatot létrehozni."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Csapat létrehozása sikeres."
-
-#, fuzzy
-#~ msgid "%s has joined your party."
-#~ msgstr "%s elhagyta a csapatot."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s eleve tagja a csapatnak."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s visszautasította a csapatba hívást."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#, fuzzy
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#~ msgid "You have left the party."
-#~ msgstr "Kiléptél a csapatból."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s elhagyta a csapatot."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Egy ismeretlen csapattárs mondja: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Dobj be egy érmét a folytatáshoz."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Nem haltál meg...csak alszol..."
-
-#~ msgid "You are no more."
-#~ msgstr "Nem létezel többé."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Megszüntél létezni."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Véged és elindultál találkozni a készítőddel."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Hulla vagy."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Megfosztottak az életedtől. Nyugodj békében."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Szép vagy mikor alszol..."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Történelem vagy."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Elég gallyul nézel ki."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Feldobtad a talpad."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr "Megfulladtál a saját véredben."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Ex-játékos lettél."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Az örök búzamezőkön kaszálgatsz."
-
-#~ msgid "Message"
-#~ msgstr "Üzenet"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
-
-#, fuzzy
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
-
-#, fuzzy
-#~ msgid "You picked up %s."
-#~ msgstr "Zsákmányod "
-
-#, fuzzy
-#~ msgid "You spent %s."
-#~ msgstr "Kapott tárgy: %s."
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Előbb tegyél be nyílvesszőt."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Üzlet sikertelen!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Hangulatjel küldése sikertelen!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Ülés sikertelen!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Beszélgetés létrehozása sikertelen."
-
-#~ msgid "Could not join party!"
-#~ msgstr "Nem tudsz csatlakozni a csapatba."
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Nem tudsz ordítani!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Nem érted még el a megfelelő szintet!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Kevés az életed!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Kimerültél."
-
-#~ msgid "You have no memos!"
-#~ msgstr "Nincs feljegyzésed."
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Most nem csinálhatod!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Úgy néz ki több pénzre van szükséged... ;)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Ezzel a fegyverrel nem tudod ezt a képességet használni!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Egy másik piros kőre van szükséged!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Egy másik kék kőre van szükséged!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Huh? Mi volt ez?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Teleport sikertelen..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Nem tudsz semmit ellopni..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "A méregnek nem volt hatása..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Az üzlet nem lehetséges. A partner túl messze van."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Az üzlet nem lehetséges. A partner nem létezik."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Az üzlet ismeretlen okból megszakadt."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Üzlet: Te és %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Te és %s üzlete megszakadt."
-
-#, fuzzy
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Lekezeletlen üzlet elutasító csomag."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
-
-#, fuzzy
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr ""
-#~ "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Szint: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "TP:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Mozgás balra"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Karakter statok rendben"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Hangulatjel"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Üzlet Te és %s között@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|%s megtámadása@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Bevet@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|mégse@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Visszavesz@@"
-
-#, fuzzy
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|%s tiltása@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Bevet@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|%s tiltásának feloldása@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Teljesen letiltod %s-t@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Felhasználó csapatba hívása"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Játékos kirúgása@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|%s tiltásának feloldása@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Bevet@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|%s megtámadása@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Játékos kirúgása@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Neve hozzáadása a csevegéshez@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|mégse@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Vedd fel a(z) %s-t@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Hozzáadás a chat-hez@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Bevet@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Ok Kiválasztása"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Segítség --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Megmutatja ezt a segítséget"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Megmutatja a térkép nevét"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Megmutatja az online felhasználókat"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Mondasz valamit magadról"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Letörli ezt az ablakot"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Privát üzenetet küld egy felhasználónak"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > msg megfelelője"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > msg megfelelője"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Fület hoz létre privát beszélgetéshez"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > query megfelelője"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Bezárja a privát fület."
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Publikus csatornák listázása"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Új csapat létrehozása"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Új csapat létrehozása"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Felhasználó csapatba hívása"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr ""
-#~ "/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr "/present > \"Hallható\" játékosok kilistázása"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Globális üzenet (csak GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Bezárja a privát fület."
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Privát üzenetet küld egy felhasználónak"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
-
-#~ msgid "Command: /help"
-#~ msgstr "Parancs: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Ez a parancs az elérhető parancsokat listázza."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Parancs: /help <parancsnév>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr ""
-#~ "Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Parancs: /announce <üzenet>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** csak GM-nek elérhető ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
-#~ "elérhető játékosnak."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Parancs: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Törli a beszélgetés panel tartalmát."
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Parancs: /item <szabály>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Ez a parancs megmutatja az online játékosok számát."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Parancs: /join <csatorna>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Kilistázza az összes csatornát."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Parancs: /me <üzenet>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Parancs: /msg <név> <üzenet>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Parancs: /whisper <név> <üzenet>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Parancs: /w <név> <üzenet>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr ""
-#~ "Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
-#~ "játékosnak."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Parancs: /query <név>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Parancs: /q <név>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott "
-#~ "nevű játékossal."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Parancs: /w <név> <üzenet>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Parancs: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Parancs: /create <csapatnév>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr ""
-#~ "Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott "
-#~ "néven."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Parancs: /create <csapatnév>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr ""
-#~ "Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott "
-#~ "néven."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Parancs: /party <név>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Parancs: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is "
-#~ "rögzíti, ha éppen rögzítjük a beszélgetést."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Parancs: /toggle <állás>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<állás> lehet \"1\", \"yes\", \"true\" ha ki akarod kapcsolni a chat "
-#~ "input automatikus eltűnését, \"0\", \"no\", \"false\"  ha nem."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Parancs: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "A /toggle jelenlegi állását mutatja meg."
-
-#~ msgid "Command: /where"
-#~ msgstr "Parancs: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
-
-#~ msgid "Command: /who"
-#~ msgstr "Parancs: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Ez a parancs megmutatja az online játékosok számát."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Parancsok listája: /help"
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Effektek részletessége"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Környezeti effektek"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Hangulatjel Gyorsmenü %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Sebzéskor"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Téma: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Név: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Minitérkép Ablak"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Beszélgetés rögzítése külső fájlba"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "parancs: /record <fájlnév>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
-#~ "fájlba."
-
-#~ msgid "Command: /record"
-#~ msgstr "Parancs: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Befejezi a beszélgetés rögzítését."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "A látogatottság rögzíve lessz."
-
-#~ msgid "Finishing recording."
-#~ msgstr "Rögzítés befejezése."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Jelenleg nem rögzítesz."
-
-#~ msgid "Already recording."
-#~ msgstr "Már rögzítesz."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Rögzítés megkezdése..."
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Sikertelen rögzítés."
-
-#~ msgid "Recording..."
-#~ msgstr "Rögzítés..."
-
-#~ msgid "Stop recording"
-#~ msgstr "Rögzítés leállítása"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Útvonal Keresése a Kurzorig"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "Élet:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "Varázserő:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "TP:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Pénz: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Munka:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Szint: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Csapat létrehozása sikeres."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
-
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Konfigurációs fájl használata"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Konfigurációs fájl használata"
-
-#~ msgid "Sound"
-#~ msgstr "Hang"
-
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Hozzáférés megtagadva"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Ismeretlen hiba a karakter választásnál."
-
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Meghívás jelenleg nem lehetséges."
-
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s a csapatába hívott."
-
-#~ msgid "Willpower:"
-#~ msgstr "Akaraterő:"
-
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Üzlet Te és %s között"
-
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Privát üzenet"
-
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Felvenni %s-t a barátok közé@@"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Semmibevett"
-
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Teljesen letiltod %s-t@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|%s meghívása a klánodba@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|%s meghívása a csapatodba@@"
-
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Privát Te és %s között@@"
-
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Szörny kirúgása@@"
-
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Felvesz"
-
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Nem tudsz üres üzenetet küldeni!"
-
-#~ msgid "Unable to unequip."
-#~ msgstr "Nem tudod eltenni."
-
-#~ msgid "Text Shadow"
-#~ msgstr "Szövegárnyék"
-
-#~ msgid "Text Outline"
-#~ msgstr "Szöveg körvonala"
-
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Töltésjelző cimkék"
-
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "A tárgy túl drága"
-
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "A tárgy használatban van"
-
-#~ msgid "GM"
-#~ msgstr "GM"
-
-#~ msgid "Server"
-#~ msgstr "Szerver"
-
-#~ msgid "Logger"
-#~ msgstr "Rögzítő"
-
-#~ msgid "Unknown Item Type"
-#~ msgstr "Ismeretlen tárgy típus"
-
-#~ msgid "Generics"
-#~ msgstr "Gyógyszer"
-
-#~ msgid "Hats"
-#~ msgstr "Fejfedő"
-
-#~ msgid "Usables"
-#~ msgstr "Bevethető"
-
-#~ msgid "Shirts"
-#~ msgstr "Felső"
-
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "1 kezes fegyverek"
-
-#~ msgid "Pants"
-#~ msgstr "Nadrág"
-
-#~ msgid "Shoes"
-#~ msgstr "Cipő"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "1 kezes fegyverek"
-
-#~ msgid "Shields"
-#~ msgstr "Pajzsok"
-
-#~ msgid "Rings"
-#~ msgstr "Gyűrűk"
-
-#~ msgid "Necklaces"
-#~ msgstr "Nyaklánc"
-
-#~ msgid "Arms"
-#~ msgstr "Kezek"
-
-#~ msgid "Ammo"
-#~ msgstr "Töltény"
-
-#~ msgid "HP Bar"
-#~ msgstr "Élet csík"
-
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 élet csík"
-
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 élet csík"
-
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Élet csík"
-
-#~ msgid "no"
-#~ msgstr "Nem"
-
-#~ msgid "Buddy"
-#~ msgstr "Partner"
-
-#~ msgid "Buddy List"
-#~ msgstr "Partnerlista"
-
-#~ msgid "Description: %s"
-#~ msgstr "Leírás: %s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "Hatás: %s"
-
-#~ msgid "New"
-#~ msgstr "Új"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Munka szint: %d"
-
-#~ msgid "Present: "
-#~ msgstr "Közel van: "
-
-#~ msgid "Quit Guild"
-#~ msgstr "Klán elhagyása"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Recent:"
-#~ msgstr "Előzmény:"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Teszt Varázs 1 Bevetése"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Teszt Varázs 2 Bevetése"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Teszt Varázs 3 Bevetése"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "2 kezes fegyverek"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Nem használ@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Használ@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Eldob@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Szétválaszt@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Raktároz@@"
-
-#~ msgid "Select Server"
-#~ msgstr "Válassza ki a szervert"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "Nem lehet erre váltani: "
-
-#~ msgid "windowed"
-#~ msgstr "ablakban"
-
-#~ msgid "fullscreen"
-#~ msgstr "teljes képernyőn"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "Misztikus képesség"
-
-#~ msgid "Weapons"
-#~ msgstr "Fegyverek"
-
-#~ msgid "Crafts"
-#~ msgstr "Mesterségek"
-
-#~ msgid "Stats"
-#~ msgstr "Statok"
-
-#~ msgid "Total"
-#~ msgstr "Összes"
-
-#~ msgid "Cost"
-#~ msgstr "Költség"
-
-#~ msgid "Attack:"
-#~ msgstr "Fizikális sebzés:"
-
-#~ msgid "% Reflex:"
-#~ msgstr "Reflex (%):"
-
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Elosztható pontok: %d"
-
-#~ msgid "curl error "
-#~ msgstr "curl hiba "
-
-#~ msgid " host: "
-#~ msgstr " kiszolgáló: "
-
-#~ msgid "Buddys"
-#~ msgstr "Partnerek"
-
-#~ msgid "Party Window"
-#~ msgstr "Csapat Ablak"
-
-#~ msgid "Unarmed"
-#~ msgstr "Ököl"
-
-#~ msgid "Knife"
-#~ msgstr "Kés"
-
-#~ msgid "Sword"
-#~ msgstr "Kard"
-
-#~ msgid "Staff"
-#~ msgstr "Bot"
-
-#~ msgid "Whip"
-#~ msgstr "Ostor"
-
-#~ msgid "Bow"
-#~ msgstr "Íj"
-
-#~ msgid "Shooting"
-#~ msgstr "Lőfegyver"
-
-#~ msgid "Mace"
-#~ msgstr "Buzogány"
-
-#~ msgid "Axe"
-#~ msgstr "Fejsze"
-
-#~ msgid "Craft"
-#~ msgstr "Mesterség"
-
-#~ msgid "Unknown Skill"
-#~ msgstr "Ismeretlen Képesség"
-
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " -t nem lehet létrehozni és nincs létrehozva! Kilépés."
-
-#~ msgid "Couldn't set "
-#~ msgstr "Nem lehet beállítani: "
-
-#~ msgid " video mode: "
-#~ msgstr " videó mód: "
-
-#~ msgid "Connecting to character server..."
-#~ msgstr "Csatlakozás a karakter szerverhez...."
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "Csatlakozás a fiók szerverhez..."
-
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Ugyanaz, mint a /create"
-
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Parancs: /new <csapatnév>"
-
-#~ msgid "Unnamed"
-#~ msgstr "Névtelen"
diff --git a/po/id.po b/po/id.po
index 18553e4fe..24a18204f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <adjieps@yahoo.com>, 2011.
 #   <Genesis_Junior@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,119 +9,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -134,260 +136,261 @@ msgstr "Perintah tidak dikenal."
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr ""
+"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Kelompok: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Organisasi: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Peringkat Pvp: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Pengecek Bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nama"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Berbicara"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Jalan"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Hasil"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Beli"
 
@@ -401,7 +404,7 @@ msgstr "Harga: %s/ Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -409,30 +412,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Toko"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -441,19 +444,19 @@ msgstr "Jual"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Batal"
 
@@ -619,9 +622,9 @@ msgstr "Masukan Sandi untuk menghapus karakter"
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Hapus"
 
@@ -695,10 +698,10 @@ msgid "rainbow 3"
 msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -706,12 +709,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -724,15 +727,15 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Abaikan"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Peta"
 
@@ -873,7 +876,7 @@ msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Tutup"
 
@@ -889,19 +892,19 @@ msgstr "Selanjutnya"
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -910,7 +913,7 @@ msgid "Help"
 msgstr "Bantuan"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Perbekalan"
 
@@ -939,31 +942,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Pecah"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Setelan"
 
@@ -972,17 +975,17 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Buang"
@@ -1032,89 +1035,89 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Atur ulang stats"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Atur ulang penghitung waktu"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d pada %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Tersisa:%d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kecepatan Exp per %d menit: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp terakhir"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "waktu sebelum Jacko kembali"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "waktu untuk ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
@@ -1134,7 +1137,7 @@ msgstr "lanjutkan"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1159,43 +1162,43 @@ msgstr "Mendaftar"
 msgid "Change Server"
 msgstr "Menganti Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Butuh"
 
@@ -1212,11 +1215,11 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1254,327 +1257,328 @@ msgstr "Copot lebih dahulu"
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tukar"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Berbisik"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Menyembuhkan"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Jadikan teman"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Mengikuti"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Tirukan"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "keluarkan  pemain"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "keluarkan"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Memuat setelan lama"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Memuat mantra lama"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Nama jangan di hapus"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "hapus nama"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Muat jalan pintas iItem lama"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Muat jalan pintas Buang yang lama"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Simpan posisi"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Ganti Server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
@@ -1610,64 +1614,64 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipe server:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Memuat"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Menyambung"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Modifikasi server"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -1777,34 +1781,38 @@ msgid "Tabs"
 msgstr "Tab"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Masukkan semua bisikan kedalam tab"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Waktu"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
@@ -1855,19 +1863,14 @@ msgstr "Biru:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Ganti"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
@@ -1912,308 +1915,368 @@ msgstr "Kembalikan"
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "macam-macam"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Bergerak"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Lainnya"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Hubungan"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Netral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Teman"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Diabaikan"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ditolak"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Dihapus"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Perbolehkan penukaran"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Perbolehkan berbisik"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Lama"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Masukkan semua bisikan kedalam tab"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Perlihatkan jenis kelamin"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pemain"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Ketika menolak:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Perlihatkan jenis kelamin"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Perlihatkan Level"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nama yang tampak"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nama yang tampak"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Hubungan"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Netral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Teman"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Diabaikan"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ditolak"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Dihapus"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Perbolehkan penukaran"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Perbolehkan berbisik"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Lama"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Ketika menolak:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Besar (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Sangat besar (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Sangat besar sekali (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -2265,134 +2328,114 @@ msgstr "sedang"
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Akselerasi perangkat keras"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "sebagai partikel"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Perubahan akan memberikan efek saat pergantian peta."
 
@@ -2421,7 +2464,8 @@ msgstr "Umumkan"
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
@@ -2463,7 +2507,7 @@ msgstr "Level: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Organisasi"
 
@@ -2495,7 +2539,7 @@ msgstr "Tinggalkan organisasi?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Kelompok"
 
@@ -2657,502 +2701,502 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) jalan"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Tidak ada target"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Perbolehkan Target"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Membutuhkan Target"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Sihir dasar"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Sihir kehidupan"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Sihir perang"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Sihir transmutasi"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Sihir alam"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Sihir Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "sihir"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "lainnya"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Simbol:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Perintah:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipe target:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Level sihir:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Level sekolah:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Simpan"
 
@@ -3189,47 +3233,46 @@ msgstr "Anda memberikan:"
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Mengupdate..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr ""
 
@@ -3381,23 +3424,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3462,6 +3505,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
 
@@ -3499,6 +3543,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Ganti"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3532,8 +3580,7 @@ msgid "Command: /unignore <player>"
 msgstr "perintah: /unignore <nama pemain>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3628,11 +3675,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Tempat penyimpanan"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4025,67 +4072,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
@@ -4193,117 +4240,808 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Kekuatan"
+
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Daya/Tenaga Hidup"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Kecerdasan"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Ketangkasan"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Kamu sudah berada di dalam organisasi"
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "perintah ini mengundang <nama> untuk menjadi bagian kelompok anda"
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Versi yang digunakan sudah kadaluarsa."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Server kepenuhan."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Username dihapus permanen."
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s telah bergabung dengan kelompok"
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
+"beregenerasi."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Anda tidak dapat melakukannya sekarang"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4357,16 +5095,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr ""
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
@@ -4430,10 +5158,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr ""
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
@@ -4466,10 +5190,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -4545,24 +5265,11 @@ msgstr ""
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr ""
@@ -4753,5 +5460,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/it.po b/po/it.po
index 608133e79..69167b2ec 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 #   <guglielmo__@hotmail.it>, 2011.
 # WildX <guglielmo__@hotmail.it>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,111 +9,120 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/"
-"it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1030
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
 msgstr "Mancato"
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:900
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:931
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Accesso"
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Ricerca personaggi"
 
-#: src/client.cpp:1087
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1097
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1177
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Cambiamento password"
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1197
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Cambio Email"
 
-#: src/client.cpp:1198
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1218
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1612
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, 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."
@@ -129,8 +138,8 @@ msgstr "Impossibile inviare un sussurro vuoto!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
@@ -140,7 +149,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
@@ -288,106 +297,105 @@ msgstr ""
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
-"\" (falso), \"1\", \"0\"."
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
+"(falso), \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio della schermata fallito!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è stata persa."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1425
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
 
-#: src/gui/beingpopup.cpp:108
+#: src/gui/beingpopup.cpp:118
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
-#: src/gui/beingpopup.cpp:122
+#: src/gui/beingpopup.cpp:132
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilda: %s"
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rango PvP: %d"
 
-#: src/gui/beingpopup.cpp:146
+#: src/gui/beingpopup.cpp:156
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Movimento"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Risultato"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Compra"
 
@@ -416,7 +424,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Esci"
 
@@ -427,31 +435,31 @@ msgid "Max"
 msgstr "Massimo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vendi"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -620,8 +628,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Elimina"
 
@@ -695,10 +703,10 @@ msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -706,12 +714,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -725,13 +733,14 @@ msgid "No"
 msgstr "No"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Mappa"
 
@@ -871,8 +880,8 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Chiudi"
 
@@ -888,9 +897,8 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
@@ -898,10 +906,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Togli"
 
@@ -909,80 +917,80 @@ msgstr "Togli"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "Slot:"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
 msgstr "Ordina per:"
 
-#: src/gui/inventorywindow.cpp:121
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
 msgstr "na"
 
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
 msgstr "az"
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr "id"
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr "Attrezzatura"
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1032,91 +1040,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Reset statistiche"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Reset timer"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1214,10 +1222,11 @@ msgid "Submit"
 msgstr "Invia"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1255,88 +1264,87 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
 msgstr ""
 
@@ -1348,213 +1356,223 @@ msgstr ""
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:299
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:480
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1567
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1569
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
 msgstr ""
 
@@ -1607,9 +1625,8 @@ msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Scegli il tuo server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1715,63 +1732,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Ingenieria suono"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Colori"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Salva i messaggi delle magie nella debug tab"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr ""
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
+msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Sposta tutti i sussurri in schede"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr "Salva i messaggi delle magie nella debug tab"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1779,10 +1828,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Colori"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
@@ -1826,16 +1871,15 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -1887,447 +1931,515 @@ msgstr "Sono stati rilevati conflitti nei tasti."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
-msgid "Show damage inflicted to monsters"
-msgstr ""
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Mostri"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
+msgid "Show monster hp bar"
 msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr ""
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
+msgid "Cycle monster targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
+msgid "Highlight floor items"
 msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
+msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Giocatori"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nomi visibili"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relazione"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutrale"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Amico"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Disprezzato"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorato"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Sposta tutti i sussurri in schede"
-
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Giocatori"
-
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
-#: src/gui/setup_players.cpp:313
-msgid "Show level"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:317
-msgid "Show own name"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:321
-msgid "Target dead players"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:325
-msgid "Secure trades"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Dimensione caratteri"
+
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Nessun testo"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Testo"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Nuvolette senza nomi"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Nuvolette con nomi"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "medio"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "massimo"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:328
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Nomi visibili"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Effetti particelle"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:353
-msgid "Show background"
-msgstr ""
-
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Testo sovrastante"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Dimensione caratteri"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "I cambi saranno effettuati al cambio della mappa."
 
@@ -2344,7 +2456,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -2356,8 +2468,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
@@ -2399,7 +2511,7 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilda"
 
@@ -2431,7 +2543,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
@@ -2593,243 +2705,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3008,87 +3120,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3112,26 +3224,27 @@ msgstr "Accettato. In attesa..."
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Cambia"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla"
+" finestra."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
@@ -3152,21 +3265,21 @@ msgstr "Connessione..."
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Completato"
 
@@ -3206,10 +3319,6 @@ msgstr "Nomi dei GM"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Mostri"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr ""
@@ -3322,23 +3431,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3403,7 +3512,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Questo comando rende <nick> un operatore del canale"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
@@ -3476,7 +3585,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <giocatore>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3681,7 +3791,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Scorciatoia %d"
@@ -3796,7 +3906,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
@@ -3833,199 +3943,203 @@ msgstr "Scheda Chat Precedente"
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "Seleziona OK"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3455
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3817
+#: src/localplayer.cpp:3849
 msgid "You see "
 msgstr ""
 
@@ -4133,1195 +4247,1186 @@ msgstr "Grazie per l'acquisto."
 msgid "Unable to buy."
 msgstr "Impossibile acquistare."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Forza"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Agilità"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Destrezza"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Vitalità"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Intelligenza"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Sei morto."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
-"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Non sei più così vivo."
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Le fredde mani della morte stanno afferrando la tua anima."
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
-"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
-"in un posto migliore."
 
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
-"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
-"ha fallito."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Suppongo non sia andata troppo bene."
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informazioni"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Annichilito."
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
+#: src/net/ea/chathandler.cpp:128
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:337
-msgid "Press OK to respawn."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:338
-msgid "You Died"
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-msgid "Not logged in."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:154
-msgid "Character's name already exists."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:166
-msgid "Character's stats are too high."
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:169
-msgid "Character's stats are too low."
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-msgid "Unknown error."
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Informazioni"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "La gilda è stata creata."
 
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Player deleted."
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:222
-msgid "Selection out of range."
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:225
-#, c-format
-msgid "Unknown error (%d)."
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "Nessun gameserver è disponibile."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Topic: %s"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:299
+#: src/net/ea/guildhandler.cpp:190
 #, c-format
-msgid "%s entered the channel."
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:304
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "%s left the channel."
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:320
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
-msgid "%s has set mode %s on user %s."
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:331
+#: src/net/ea/guildhandler.cpp:196
 #, c-format
-msgid "%s has kicked %s."
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "La gilda è stata creata."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Errore durante la creazione della gilda."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Invito spedito."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93
-msgid "Wrong magic_token."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-msgid "Already logged in."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:99
-msgid "Account banned."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124
-msgid "New password incorrect."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-msgid "Old password incorrect."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:156
-msgid "New email address incorrect."
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:159
-msgid "Old email address incorrect."
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:167
-msgid "The new email address already exists."
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-msgid "Client version is too old."
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:278
-msgid "Wrong username or password."
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:284
-msgid "Account banned"
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-msgid "Wrong username, password or email address."
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:318
-msgid "Username already exists."
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:321
-msgid "Email address already exists."
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s si è unito al party."
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignora la richiesta di commercio."
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vuole commerciare con te, accetti?"
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Commerciando con %s"
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Scambio cancellato."
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Scambio completato."
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Espulsione fallita!"
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Kick riuscito!"
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Grazie per la vendita."
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Impossibile vendere."
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:138
-msgid "Unable to sell while trading."
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:141
-msgid "Unable to sell unsellable item."
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:121
-msgid "Access denied. Most likely, there are too many players on this server."
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-msgid "Cannot use this ID."
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-msgid "Unknown char-server failure."
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
 msgstr ""
-"Creazione del personaggio fallita. E' molto probabile che il nome sia già "
-"stato preso."
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-msgid "Wrong name."
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
-msgid "Incorrect stats."
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
-msgid "Incorrect hair."
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
-msgid "Incorrect slot."
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
-msgid "Character deleted."
-msgstr "Personaggio cancellato."
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
-msgid "Failed to delete character."
-msgstr "Cancellazione del personaggio fallita."
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Forza:"
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Agilità:"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Vitalità:"
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Intelligenza:"
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Destrezza:"
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Fortuna:"
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
+#: src/net/ea/partyhandler.cpp:140
 #, c-format
-msgid "Whisper could not be sent, %s is offline."
+msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Whisper could not be sent, ignored by %s."
+msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-msgid "MVP player."
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-msgid "MVP player: "
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "I canali non sono supportati!"
-
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Online users: %d"
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-msgid "Game"
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-msgid "Request to quit denied!"
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Forza %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
-msgid "Agility %+d"
-msgstr "Agilità %+d"
+msgid "%s has left your party."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
-msgid "Vitality %+d"
-msgstr "Vitalità %+d"
+msgid "An unknown member tried to say: %s"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligenza %+d"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "Sei morto."
 
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Destrezza %+d"
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Fortuna %+d"
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "Non sei più così vivo."
 
-#: src/net/tmwa/generalhandler.cpp:138
-msgid "Authentication failed."
-msgstr ""
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Le fredde mani della morte stanno afferrando la tua anima."
 
-#: src/net/tmwa/generalhandler.cpp:141
-msgid "No servers available."
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
-msgid "Someone else is trying to use this account."
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
-msgid "This account is already logged in."
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 msgstr ""
+"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
+"in un posto migliore."
 
-#: src/net/tmwa/generalhandler.cpp:151
-msgid "Speed hack detected."
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
 msgstr ""
+"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
+"ha fallito."
 
-#: src/net/tmwa/generalhandler.cpp:154
-msgid "Duplicated login."
-msgstr ""
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "Suppongo non sia andata troppo bene."
 
-#: src/net/tmwa/generalhandler.cpp:157
-msgid "Unknown connection error."
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "Disconnesso dal server!"
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
 
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Fortuna"
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Annichilito."
 
-#: src/net/tmwa/generalhandler.cpp:265
-msgid "Defense"
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:266
-msgid "M.Attack"
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
-msgid "M.Defense"
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
-#, no-c-format
-msgid "% Evade"
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
-#, no-c-format
-msgid "% Critical"
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-msgid "Attack Delay"
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-msgid "Walk Delay"
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-msgid "Attack Range"
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Mostra questo messaggio di aiuto"
-
-#: src/net/tmwa/gui/guildtab.cpp:78
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-msgid "You are already in guild."
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
-msgid "Emperium check failed."
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-msgid "Unknown server response."
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
-msgid "Guild name: %s"
+msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
+#: src/net/ea/playerhandler.cpp:457
 #, c-format
-msgid "Guild master: %s"
+msgid "You spent %s."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, c-format
-msgid "Guild level: %d"
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
-#, c-format
-msgid "Online members: %d"
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
-#, c-format
-msgid "Max members: %d"
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, c-format
-msgid "Average level: %d"
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, c-format
-msgid "Guild exp: %d"
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, c-format
-msgid "Guild next exp: %d"
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, c-format
-msgid "Guild castle: %s"
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
-msgid "Could not inivte user to guild."
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
-msgid "User rejected guild invite."
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-msgid "User is now part of your guild."
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
-msgid "Your guild is full."
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-msgid "Unknown guild invite response."
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-msgid "You have left the guild."
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, c-format
-msgid "%s has left your guild."
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
-msgid "You was kicked from guild."
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, c-format
-msgid "%s has kicked from your guild."
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invita un giocatore al tuo party"
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Abbandona il party"
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
 msgstr ""
-"/item > Mostra/modifica le opzioni di condivisione degli oggetti nel gruppo"
 
-#: src/net/tmwa/gui/partytab.cpp:74
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
 msgstr ""
-"/item > Mostra/modifica le opzioni di condivisione dei punti esperienza nel "
-"gruppo"
 
-#: src/net/tmwa/gui/partytab.cpp:84
-msgid "This command invites <nick> to party with you."
-msgstr "Questo comando invita <nick> nel tuo party."
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command causes the player to leave the party."
-msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vuole commerciare con te, accetti?"
 
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /item <policy>"
-msgstr "Comando: /item <politica>"
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
-msgid "This command changes the party's item sharing policy."
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
-"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
 
-#: src/net/tmwa/gui/partytab.cpp:98
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
 msgstr ""
-"<politica> può essere uno fra \"1\", \"yes\", \"true\" per abilitare la "
-"condivisione degli oggetti o \"0\", \"no\", \"false\" per disabilitarla."
 
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "Command: /item"
-msgstr "Comando: /item"
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
-msgid "This command displays the party's current item sharing policy."
-msgstr "Questo comando mostra la corrente politica di condivisione oggetti."
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:107
-msgid "Command: /exp <policy>"
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
-msgid "This command changes the party's experience sharing policy."
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:113
-msgid "Command: /exp"
-msgstr "Comando: /exp"
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
-msgid "This command displays the party's current experience sharing policy."
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
-msgid "Item sharing enabled."
-msgstr "Abilitata la condivisione degli oggetti."
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Scambio cancellato."
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
-msgid "Item sharing disabled."
-msgstr "Disabilitata la condivisione degli oggetti"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Scambio completato."
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
-msgid "Item sharing not possible."
-msgstr "Impossibile condividere gli oggetti."
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Forza"
 
-#: src/net/tmwa/gui/partytab.cpp:157
-msgid "Item sharing unknown."
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
-msgid "Experience sharing enabled."
-msgstr "Abilitata la condivisione dell'esperienza."
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilità"
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
-msgid "Experience sharing disabled."
-msgstr "Disabilitata la condivisione dell'esperienza."
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
-msgid "Experience sharing not possible."
-msgstr "Impossibile condividere l'esperienza."
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destrezza"
 
-#: src/net/tmwa/gui/partytab.cpp:196
-msgid "Experience sharing unknown."
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
-msgid "Failed to use item."
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalità"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
-msgid "Unable to equip."
-msgstr "Impossibile equipaggiare."
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligenza"
 
-#: src/net/tmwa/loginhandler.cpp:93
-msgid "Account was not found. Please re-login."
-msgstr "Account non trovato. Perfavore riesegui il login."
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-msgid "New password too short."
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-msgid "Unregistered ID."
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-msgid "Wrong password."
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-msgid "Account expired."
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-msgid "Rejected from server."
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:180
-msgid "Client too old."
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:190
-msgid "Server overpopulated."
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-msgid "This user name is already taken."
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-msgid "Username permanently erased."
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-msgid "Unable to resolve host \""
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
-msgid "Connection to server terminated. "
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:86
-msgid "Could not create party."
-msgstr "Non puoi creare un party."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
-msgid "Party successfully created."
-msgstr "Party creato con successo."
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, c-format
-msgid "%s has joined your party."
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
-msgid "%s is already a member of a party."
-msgstr "%s è già membro di un party."
+msgid "Unknown error (%d)."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s ha rifiutato il tuo invito."
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Nessun gameserver è disponibile."
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
-msgid "%s is now a member of your party."
-msgstr "%s è ora un membro del tuo party."
+msgid "Topic: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
-#, c-format
-msgid "%s can't join your party because party is full."
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, c-format
-msgid "QQQ Unknown invite response for %s."
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
-msgid "You have left the party."
-msgstr "Hai lasciato il party."
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
-#, c-format
-msgid "%s has left your party."
-msgstr "%s ha lasciato il tuo party."
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
-msgid "An unknown member tried to say: %s"
+msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
-msgid "%s is not in your party!"
-msgstr "%s non è nel tuo party!"
+msgid "%s left the channel."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "Inserisci un gettone per continuare."
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "Non sei morto. Stai riposando."
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Non sei più."
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Hai smesso di esistere."
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Errore durante la creazione della gilda."
 
-#: src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "Sei spirato e sei andato a incontrare il tuo creatore."
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Invito spedito."
 
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Sei cadavere."
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Privato della vita, riposi in pace."
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "I tuoi processi metabolici sono storia ora."
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "Hai tirato le cuoia."
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Sei un ex-giocatore."
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
-msgid "Message"
-msgstr "Messaggio"
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
-"Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
-"energie."
 
-#: src/net/tmwa/playerhandler.cpp:353
-msgid "You are carrying less than half your weight. You can regain health."
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, c-format
-msgid "You picked up %s."
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, c-format
-msgid "You spent %s."
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
-msgid "Cannot raise skill!"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
-msgid "Equip arrows first."
-msgstr "Equipaggia prima le frecce"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
-msgid "Trade failed!"
-msgstr "Scambio fallito!"
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
-msgid "Emote failed!"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
-msgid "Sit failed!"
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
-msgid "Chat creating failed!"
-msgstr "Creazione della chat fallita!"
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
-msgid "Could not join party!"
-msgstr "Non puoi unirti al party!"
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s si è unito al party."
 
-#: src/net/tmwa/specialhandler.cpp:173
-msgid "Cannot shout!"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Non hai ancora raggiunto un livello abbastanza alto."
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
-msgid "Insufficient HP!"
-msgstr "HP insufficienti!"
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Ignora la richiesta di commercio."
 
-#: src/net/tmwa/specialhandler.cpp:193
-msgid "Insufficient SP!"
-msgstr "SP insufficienti!"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Commerciando con %s"
 
-#: src/net/tmwa/specialhandler.cpp:196
-msgid "You have no memos!"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Espulsione fallita!"
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Kick riuscito!"
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Grazie per la vendita."
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Impossibile vendere."
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
-msgid "You cannot do that right now!"
-msgstr "Non puoi farlo ora!"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
-msgid "Seems you need more money... ;-)"
-msgstr "Sembra tu abbia bisogno di più denaro... ;-)"
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Forza %+d"
 
-#: src/net/tmwa/specialhandler.cpp:205
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Non puoi usare questa abilità con questo tipo di arma!"
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Agilità %+d"
 
-#: src/net/tmwa/specialhandler.cpp:209
-msgid "You need another red gem!"
-msgstr "Hai bisogno di un'altra gemma rossa!"
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitalità %+d"
 
-#: src/net/tmwa/specialhandler.cpp:212
-msgid "You need another blue gem!"
-msgstr "Hai bisogno di un'altra gemma blu!"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligenza %+d"
 
-#: src/net/tmwa/specialhandler.cpp:215
-msgid "You're carrying to much to do this!"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Destrezza %+d"
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Fortuna %+d"
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
-msgid "Huh? What's that?"
-msgstr "Huh? Cos'è quello?"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
-msgid "Warp failed..."
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
-msgid "Could not steal anything..."
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
-msgid "Poison had no effect..."
-msgstr "Il veleno non ha avuto effetto..."
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:148
-msgid "Trading isn't possible. Trade partner is too far away."
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
-msgid "Trading isn't possible. Character doesn't exist."
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
-msgid "Trade cancelled due to an unknown reason."
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "Disconnesso dal server!"
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Fortuna"
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
-#, c-format
-msgid "Trade: You and %s"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
-#, c-format
-msgid "Trade with %s cancelled."
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-msgid "Unhandled trade cancel packet."
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
-msgid "Failed adding item. Trade partner is over weighted."
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
-msgid "Failed adding item. Trade partner has no free slot."
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:260
-msgid "Failed adding item. You can't trade this item."
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:264
-msgid "Failed adding item for unknown reason."
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
 msgstr ""
 
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s non è nel tuo party!"
+
 #: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
@@ -5338,31 +5443,33 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:62
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr "Attacco %+d"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr "Difesa %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr "PF %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:168
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
+
+
diff --git a/po/ja.po b/po/ja.po
index 176f51314..4832693a3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
 # sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -10,119 +10,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -135,258 +137,262 @@ msgstr "不明なコマンド"
 msgid "Cannot send empty whispers!"
 msgstr "空のメッセージを送信することはできません！"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
-msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
+"です。"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "ギルド名がない。"
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "名前を教えてください。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "リターンはチャットを留めておきます。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "メッセージはチャットを閉じます。"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "リターンはこれからチャットを留めておきます。"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "メッセージはこれからチャットを閉じます。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーはもう%s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーは%s成功！"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "選手は%sを居られなかった "
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーは無視されなかった！"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "プレイヤーはもう無視していない！"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Playerはunignoredことができなかった！"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "プレイヤーはもう消している!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "プレーアが首尾よくに消去！"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間：%s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ：%s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド：%s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PVP ランク：%d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "ボット"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "動く"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "結果"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "買う"
 
@@ -400,7 +406,7 @@ msgstr "価格:%s /合計:%s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -408,30 +414,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -440,19 +446,19 @@ msgstr "売る"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -618,9 +624,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "削除"
 
@@ -694,10 +700,10 @@ msgid "rainbow 3"
 msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -705,12 +711,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sに送信中： %s"
@@ -723,15 +729,15 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "無視"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地図"
 
@@ -872,7 +878,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "閉じる"
 
@@ -888,19 +894,19 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "外す"
 
@@ -909,7 +915,7 @@ msgid "Help"
 msgstr "ヘルプ"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "アイテム"
 
@@ -938,31 +944,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "装備する"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "使う"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "分割する"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "服"
 
@@ -971,17 +977,17 @@ msgid "Weight:"
 msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1031,89 +1037,89 @@ msgstr "、　"
 msgid "Weight: %s"
 msgstr "重力：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "殺人統計ウィンドウ"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "統計をれセット"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "タイマーをれセット"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1133,7 +1139,7 @@ msgstr "スキップ"
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバ:"
@@ -1158,43 +1164,43 @@ msgstr "登録する"
 msgid "Change Server"
 msgstr "サーバーを変える"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "健康"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "マナ"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "経験"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "職"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "重量"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "金銭"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "矢"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "情勢"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "必要"
 
@@ -1211,11 +1217,11 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "クリア"
 
@@ -1253,327 +1259,328 @@ msgstr "外す第一"
 msgid "Away outfit"
 msgstr "装備一式不在で"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "取り去る"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "でる"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr " 名前:   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "に貿易を足す"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "10保存"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "10取る"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "半分取る"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "全部取る"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr " 隠す"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "見せる"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "保存状態"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "サーバーを切り替える"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "キャラクターを切り替える"
 
@@ -1609,64 +1616,64 @@ msgstr "パスワードは%d文字より短くなくてはいけません。"
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "サーバを選ぶ"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "サーバー形"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "ロード"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "通信"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "カスタムサーバー"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "サーバのアドレスとポート番号を両方入力してください。"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "サーバーを待っている..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "要る v%s"
@@ -1713,7 +1720,9 @@ msgstr "お知らせ"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性がある"
+msgstr ""
+"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
+"がある"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1776,34 +1785,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "プライベートメッセージをタブに出す。"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1854,19 +1867,14 @@ msgstr "青"
 msgid "Alpha:"
 msgstr "アルファ："
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "適用"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "エディット"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "ボタンを押すと較正が始まります。"
@@ -1911,308 +1919,368 @@ msgstr "標準に戻す"
 msgid "Key Conflict(s) Detected."
 msgstr "キーが重複しています。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "他"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "モンスター"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えた損傷を表示する"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "モンスターHPバーを表示する"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "パスを描画"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "仕事を表示する"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "デバッグループを有効にする"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "背景を表示する"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "関係"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "普通"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "友達"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "無視"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "無視する"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "消した"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "交換を承認する"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "プライベートメッセージを受け取ることを承認する"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "古い"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "プライベートメッセージをタブに出す。"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "性的を表示する"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "無視の際には："
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "性的を表示する"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "レベルを表示する"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "自分の名前を表示する"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "名前を表示する"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "名前を表示する"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "関係"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "普通"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "友達"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "無視"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "無視する"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "消した"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "交換を承認する"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "プライベートメッセージを受け取ることを承認する"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "古い"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "無視の際には："
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "小（11）"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "媒体（12）"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "大（13）"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "ビッグ（14）"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "巨大（15）"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
 
@@ -2264,134 +2332,114 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "粒子効果"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "ピックアップ通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "チャット中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "FPSリミット"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "粒子の詳細"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更のため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度（例：1024 × 768）"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度が変わりました。"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "変化はマップがかわったときから影響します。"
 
@@ -2420,7 +2468,8 @@ msgstr "発表する"
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "取引要求"
 
@@ -2462,7 +2511,7 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl：%d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "ギルド"
 
@@ -2494,7 +2543,7 @@ msgstr "ギルドを残す？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "パーティー"
 
@@ -2656,502 +2705,502 @@ msgstr "パーティ名を選んでください"
 msgid "Specials"
 msgstr "スペシアール"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) 動く"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) 襲う"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) 拾い上げる"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) "
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) "
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) 不在で"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "GP:%s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "経験値:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "ジョブポイント:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント： %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル： %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点： %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "ターゲットなし"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "ターゲットを許可する"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "ターゲット必要"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "ジェネラル魔法"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "命魔法"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "戦争魔法"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "変わる魔法"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "自然魔法"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "アストラル魔法"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "コマンドエディタ"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "魔法"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "他"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "シンボル："
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "コマンド："
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "マナ："
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "ターゲットタイプ："
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "アイコン"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "魔法レベル："
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "魔法学園"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "学校レベル："
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "セーブ"
 
@@ -3188,47 +3237,48 @@ msgstr "あげる物:"
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "現金不足です。"
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
+"複して追加することは出来ません！"
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "更新しています..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 とても推奨されます。"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "完了"
 
@@ -3380,23 +3430,23 @@ msgstr ""
 msgid "Road Point"
 msgstr "ロードのポイント"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3461,12 +3511,17 @@ msgid "This command makes <nick> a channel operator."
 msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
+msgstr ""
+"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
+"囲んでください。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出すことができます。"
+msgstr ""
+"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
+"ことができます。"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3498,6 +3553,10 @@ msgstr "%sからのアナウンス:"
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "エディット"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > 他のプレイヤーを無視する"
@@ -3516,7 +3575,8 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr ""
+"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
@@ -3531,8 +3591,7 @@ msgid "Command: /unignore <player>"
 msgstr "コマンド：　/unignore <プレイヤー>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3627,11 +3686,11 @@ msgstr "ログインの変更"
 msgid "Choose World"
 msgstr "世界を選ぶ"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "保存"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "荷馬車"
 
@@ -4024,67 +4083,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "あなた"
 
@@ -4192,117 +4251,816 @@ msgstr "買ってくださり、ありがとうございました。"
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "強さ"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "筋力:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "素早さ:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "体力:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "知性:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "敏捷:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "運:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "ID使用不可能。"
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "キャラクター作成失敗。本名はのう使われている。"
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "名前間違い"
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "不適切な統計。"
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "不適切な髪。"
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "不適切なスロット。"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "情報"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "キャラクターを削除した。"
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "キャラ削除失敗"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "チャンネルはサポートされていない。"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "強度 (str) %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "素早さ"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "プレイヤー MVP"
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "プレイヤー MVP "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "機敏さ (agi) %+.1f"
+msgid "Online users: %d"
+msgstr "オンラインユーザー：%d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "器用さ"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "ゲーム"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "コマンド: /invite ＜プレイヤー名＞"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "コマンド: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/helpでこのヘルプを表示する。"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "ギルド作成成功"
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "不明なサーバーの応答。"
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "器用さ (dex) %+.1f"
+msgid "Guild name: %s"
+msgstr "ギルド名：%s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "活力"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "ギルドマスタ： %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "活気 (vit) %+.1f"
+msgid "Guild level: %d"
+msgstr "ギルドレベル：%d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "知能"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "オンラインウザー： %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "知能 (int) %+.1f"
+msgid "Max members: %d"
+msgstr "最大のメンバー： %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "気力"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "平均レベル： %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "意地 (wil) %+.1f"
+msgid "Guild exp: %d"
+msgstr "ギルド経験：%d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "ギルド城：%s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/inviteでパーティにプレーヤーを招待する。"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leaveで既存のパーティから離れる。"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kickで既存のパーティから一人を追い出してみる。"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "本コマンドではパティからプレイヤーを追い出させる。"
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "コマンド: /item <ポリシ>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "本コマンドでは、アイテム共有モードを変更する。"
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
+"るために、「0」、「no」か「false」を設定ください。"
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "コマンド: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr "本コマンドでは、アイテム共有モードを表示する。"
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "コマンド: /exp <ポリシ>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "本コマンドでは、経験分割モードを変更する。"
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
+"る場合、「0」、「no」か「false」を設定ください。"
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "コマンド: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "アイテムシェア有効"
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "アイテムシェア無効"
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "アイテムシェア不可能"
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "アイテムシェア不明"
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "経験シェア有効"
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "経験シェア無効"
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "経験シェア不可能"
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "経験シェア不明"
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "アイテム使用失敗"
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "装備不可能"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "アカウントが見つからなかった。再ログインをください。"
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "新パスワードは短い過ぎます。"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "不明エラー"
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "未登録なID。"
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "入力したパスワードは間違っています。"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "アカウントの有効期限が切られた。"
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"あなたは%sまでゲームからバーンされた。\n"
+"ゲームマスターたちにご連絡ください。"
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "ユーザ名はもう使われている。"
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "パーティ作成失敗"
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "パーティ作成成功"
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%sはもうパーティのメンバーである。"
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%sは招待を拒んだ。"
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%sは今からパーティのメンバーになった。"
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "パーティから離れた。"
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%sがパーティから離れた。"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "不明なメンバーが言おうとした事: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "あなたは死にました。"
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "今から生きていない。"
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "死神の冷たい手に魂が取られてしまった。"
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "ゲームオーバー!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "ゲームを続けるためにはコインを入れてください。"
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
+msgstr ""
+"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
+"向かっただけ。"
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "喉で的の武器を潰す予定だったが…失敗した。"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "あんまり上手くいかなかったぜー"
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "持ち物を確定して欲しい？"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "全滅された。"
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "相手から自分の頭が渡されたみたい。"
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "まだ死ななかった。休憩中だけである。"
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "あなたはもう存在していない。"
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "生きることなく、いなくなった。"
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "あなたは息を引き取り、あなたを作った人へ逢いに行ってしまった。"
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "あなたは死体である。"
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "命を失い、天国に向かった。"
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
+"ないか？"
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "あなたのがんばりは今や歴史となったらしい。"
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "クタバッタみたいな。"
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "人間界から追い出された。"
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr "最後の呼吸だった。死神に会った後、無と結合しちゃった。"
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "旧プレイヤーである。"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "お前の魂は北極まで飛ばれた。"
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "メッセージ"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "あなたは %s を費やし"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "スキルはもう上がらない！"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "矢を先に装備してください。"
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "取引失敗"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "スマイリー表示失敗"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "触ることが失敗した。"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "チャット作成失敗"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "パーティに参加できなかった！"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "叫べない！"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "あなたはまだ十分に高いlvlを達していない！"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "HP不足！"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "SP不足！"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "メモなし！"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "今この行動は無理。"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "金欠みたいんじゃないか…"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "本スキルがこの武器と使えない。"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "他の赤宝石が必要となった！"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "他の青宝石が必要となった！"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "アイテムが持ちすぎている状態！"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "うん？何それ？"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "ワープが失敗した。"
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "何も盗めなかった…"
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "毒は不効果"
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%sはあなたと取引したいみたいが、応じる？"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "取引は不可能。取引の相手は遠すぎる。"
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "取引は不可能。本キャラが存在していない。"
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "不明な理由で取引が中止された。"
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "あなたと%sとの取引"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "%sとの取引が中止された。"
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "できなかった取引キャンセルパケット"
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "アイテム追加失敗。相手の空いているスロットはない。"
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "不明な理由でアイテム追加失敗"
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "取引中止"
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "取引完了"
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "強さ"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "強度 (str) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "素早さ"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "機敏さ (agi) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "器用さ"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "器用さ (dex) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "活力"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "活気 (vit) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "知能"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "知能 (int) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "気力"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "意地 (wil) %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4356,16 +5114,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "無効場所の号"
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "不明エラー"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "情報"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "プレイヤーは削除された。"
@@ -4429,10 +5177,6 @@ msgstr "%s は％を蹴った %s"
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "ギルド作成成功"
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "ギルド作成エラー"
@@ -4465,10 +5209,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "アカウントが接続されていない。最初にログインしてください。"
@@ -4544,24 +5284,11 @@ msgstr "取引要求を受け取り中"
 msgid "Ignoring incoming trade requests."
 msgstr "取引要求を無視にしている。"
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%sはあなたと取引したいみたいが、応じる？"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "%sと取引中"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "取引中止"
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "取引完了"
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "キック失敗"
@@ -4752,5 +5479,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "不明なアイテム"
-
-
diff --git a/po/ka.po b/po/ka.po
index 9d9b5c538..128734cdc 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,2955 +1,4645 @@
-# Georgian translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-07-23 22:14+0000\n"
-"Last-Translator: Mpa4Hu <ymen9@pisem.net>\n"
-"Language-Team: Georgian <ka@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "უცნობი კომანდა."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- დახმარება --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > დახმარების გამოტანა"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > რუქის სახელის გამოტანა"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > ონლაინ მომხმარებლების რაოდენობა"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > მოყევით რამე თქვენს შესახებ"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > ფანჯრის გასუფთავება"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
+msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > პრივატული მესიჯის გაგზავნა მომხმარებლისთვის"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
+msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
+msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
 msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_video.cpp:194
+msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/help > დახმარების გამოტანა"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
-#, c-format
-msgid "% Accuracy"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Evade"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Critical"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
-
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "უცნობი კომანდა."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2957,607 +4647,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "უცნობი კომანდა."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "უცნობი კომანდა."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71f69d332..a4346b7d8 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,105 +22,106 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -133,159 +134,159 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -294,102 +295,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr ""
 
@@ -403,7 +404,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -411,30 +412,30 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -443,19 +444,19 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr ""
 
@@ -621,9 +622,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr ""
 
@@ -697,10 +698,10 @@ msgid "rainbow 3"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr ""
 
@@ -708,12 +709,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,15 +727,15 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr ""
 
@@ -875,7 +876,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr ""
 
@@ -891,19 +892,19 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr ""
 
@@ -912,7 +913,7 @@ msgid "Help"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr ""
 
@@ -941,31 +942,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -974,17 +975,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1034,91 +1035,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1138,7 +1139,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
@@ -1163,43 +1164,43 @@ msgstr ""
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1216,11 +1217,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1258,327 +1259,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr ""
 
@@ -1614,64 +1616,64 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1781,34 +1783,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
-msgid "Log magic messages in debug tab"
+msgid "Put all whispers in tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:99
-msgid "Show server messages in debug tab"
+msgid "Log magic messages in debug tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:102
-msgid "Enable trade tab"
+msgid "Show server messages in debug tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:105
-msgid "Enable battle tab"
+msgid "Enable trade tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:108
-msgid "Show battle events"
+msgid "Enable battle tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1859,19 +1865,14 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
@@ -1916,308 +1917,368 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
 msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:341
-msgid "Show statuses"
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2269,134 +2330,114 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
@@ -2425,7 +2466,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
@@ -2467,7 +2509,7 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr ""
 
@@ -2499,7 +2541,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr ""
 
@@ -2661,502 +2703,502 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3193,12 +3235,12 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3206,33 +3248,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr ""
 
@@ -3384,23 +3426,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3465,6 +3507,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3502,6 +3545,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3630,11 +3677,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4027,68 +4074,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
@@ -4196,117 +4243,806 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4360,16 +5096,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr ""
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
@@ -4433,10 +5159,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr ""
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
@@ -4469,10 +5191,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -4548,24 +5266,11 @@ msgstr ""
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index c3ef82e4b..548cb83ad 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,3032 +1,4655 @@
-# Norwegian Bokmal translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-09-02 17:55+0000\n"
-"Last-Translator: Øyvind Øritsland <Unknown>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Venter på server"
+msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Passord:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Avregistrer"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Ukjent kommando"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Hjelp --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/hjelp > Hvis denne hjelpen"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > Viser kartnavn"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > Viser antall påloggede brukere"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > Si noe om deg selv"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > Tømmer vinduet"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Send en privat melding til en bruker"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alternativ for msg"
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > Alternativ for msg"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"/query > Åpner en fane for å sende private meldinger med en annen bruker"
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > Alternativ for query"
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > Viser alle offentlige kanaler"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/delta > Delta i eller opprett en kanal"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/party > Inviter en bruker til en gruppe"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party > Inviter en bruker til en gruppe"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/innspilling > Start innspilling av chat til en ekstern fil"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "For mer informasjon, skriv /help <kommando>"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Kommando: /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Denne kommandoen viser en liste med alle tilgjengelige kommandoer."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "Kommando: /help <kommando>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Kommando: /announce <msg>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** kun tilgjengelig for GM ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Denne kommandoen sender meldingen <msg> til alle påloggede spillere."
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Kommando: /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "Denne kommandoen klarer chatte-loggen."
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Kommando: /join <kanal>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Denne kommandoen viser antall påloggede spillere -"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "Kommando: /join <kanal>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "Denne kommandoen åpner <kanal>"
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "<kanal> blir opprettet om den ikke eksisterer."
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "Kommando: /list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "Denne kommandoen viser en liste med alle kanaler."
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "Kommando: /me <melding>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Denne kommandoen forteller andre at du er (eller gjør) <melding>"
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "Kommando: /msg <brukernavn> <melding>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "Kommando: /whisper <brukernavn> <melding>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "Kommando: /w <brukernavn> <melding>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
-"Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn "
-"(\")."
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "Kommando: /query <brukernavn>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "Kommando: /q <brukernavn>"
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
-"Denne kommandoen prøver å opprette en fane for private meldinger mellom deg "
-"og <brukernavn>."
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Kommando: /party <brukernavn>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Denne kommandoen åpner <kanal>"
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "Kommando: /party <brukernavn>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Denne kommandoen inviterer <brukernavn> til en gruppe med deg."
-
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "Kommando: /record <filnavn>"
-
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
-
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "Kommando: /record"
-
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Kommando: /announce <msg>"
-
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Denne kommandoen viser antall påloggede spillere -"
-
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "Skriv /help for en liste over kommandoer."
-
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "Kan ikke sende tomme meldinger!"
-
-#: src/commandhandler.cpp:383
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Skjermbilde lagret til ~/"
+msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "Forbindelsen til serveren mistet, programmet vil nå avsluttes"
+msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Kunne ikke laste inn kart."
+msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Gruppe (%s)"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "Navn"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "Tilbakestill"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Kjøp"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "Maks"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Butikk"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Selg"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "Endre epost-adresse"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "Skriv ny epost-adresse to ganger:"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Brukernavnet må minst være %d bokstaver."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Brukernavnet må være mindre enn %d bokstaver."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Endre passord"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "Skriv nytt passord to ganger:"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Passordet må minst være %d bokstaver."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Passordet må være mindre enn %d bokstaver."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Lag karakter:"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Navn:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "Hårfarge:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "Frisyre:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "Lag"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mann"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kvinne"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vennligst distribuer %d poeng"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "Navnet ditt må minst være 4 bokstaver."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Bekreft karakter-sletting"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "Konto- og karakter"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Avregistrer"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "Endre epost-adresse"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "Lukk"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "Nei"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "Kart"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
 #, c-format
-msgid "%d FPS"
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Navn: %s"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "Penger: %s"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Partikkeleffekter"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Partikkeldetalje"
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Ambient FX: %s"
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Lukk"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "OK"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "Lukk"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Bruk"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Del opp"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "OK"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "Alt"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "Vekt:"
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "Husk brukernavn"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Kart"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "Venter på server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "Neste"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "Bekreft"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Tilbakestill"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Neste"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Til:"
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "Send"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Tekstskygge"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Bakgrunn"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Spiller"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Gruppe"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlenke"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Andre Spilleres Navn"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eget Navn"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM Navn"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCer"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstre"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Skjorter"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Én-håndsvåpen"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Bukser"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Sko"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Én-håndsvåpen"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Skjold"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringer"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Halsbånd"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunisjon"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Partikkeleffekter"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "Ignorert"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "%s har invitert deg til sin gruppe."
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "Monstre"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Tar opp …"
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "Bekreft:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "E-post:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brukernavnet må minst være %d bokstaver."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brukernavnet må være mindre enn %d bokstaver."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Passordet må minst være %d bokstaver."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Passordet må være mindre enn %d bokstaver."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "Velg server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "Kobler til..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "Server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Vennligst skriv inn både adresse og port til en server."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "Venter på server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Lyd"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "Lydeffekt-volum"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "Musikk-volum"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "Ingen tekst"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "Slik ser fargen ut"
-
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farger"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr "Slik ser fargen ut"
+
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "Forsinkelse: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "Rød: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "Grønn: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "Blå: "
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Trykk knappen for å starte kalibrasjon"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "Tildel"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstre"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Spillere"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "Navn"
+msgid "Show level"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Synlige navn"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Venn"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Tillat handel"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-#, fuzzy
-msgid "Show gender"
-msgstr "Vis navn"
-
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "Spillere"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "Bitteliten"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "Liten"
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Skriftstørrelse"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "Medium"
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "Stor"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Ingen tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bobler, ingen navn"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bobler med navn"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "høy"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "Synlige navn"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "Vis navn"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "som partikkel"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS-grense:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "Vis navn"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "GUI-gjennomsiktighet"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Partikkeldetalje"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "Skriftstørrelse"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nei"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Bytter til fullskjerm"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Bytter OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Endringer av OpenGL krever restart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Skjermresolusjon endret"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Partikkeleffekt-instillinger endret."
+msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "Opp"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Ferdighetspoeng: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "Ferdighetspoeng: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "Ferdigheter"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Nivå: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Nivå: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Er du sikker på at du vil avslutte?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Inviter en bruker til en gruppe"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "/party > Inviter en bruker til en gruppe"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Er du sikker på at du vil avslutte?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "Lag karakter:"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "Inviter Bruker"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "Stor"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Godta invitasjon fra %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Avslo invitasjon fra %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Godta invitasjon fra %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Avslo invitasjon fra %s."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "GM Navn"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "Velg server"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s har invitert deg til sin gruppe."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "Godta Gruppeinvitasjon"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s har invitert deg til sin gruppe."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s har invitert deg til sin gruppe."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "Gruppe"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "Velg server"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Penger: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Jobb: %d"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Ferdighetspoeng: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Ferdighetspoeng: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nivå: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "Andre Spilleres Navn"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "Eget Navn"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM Navn"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCer"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "Partikkeleffekter"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn "
+"(\")."
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "Kommando: /record"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Denne kommandoen viser antall påloggede spillere -"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "Velg Server"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "Velg server"
+msgstr ""
+
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Monstre"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/hjelp > Hvis denne hjelpen"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "Kan ikke sende tomme meldinger!"
-
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "Spiller"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "Navn"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Slett"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/party > Inviter en bruker til en gruppe"
-
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Denne kommandoen inviterer <brukernavn> til en gruppe med deg."
-
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
-
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Ukjent kommando"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Avregistrer"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Endre passord"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Avslo invitasjon fra %s."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
-
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3034,652 +4657,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Ukjent kommando"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "Kommando: /join <kanal>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Ukjent kommando"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "Skriv nytt passord to ganger:"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "Skriv ny epost-adresse to ganger:"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "Avslo invitasjon fra %s."
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
+msgid "Strength %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
+msgid "Agility %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
+msgid "Intelligence %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
 msgstr ""
 
-#~ msgid "no"
-#~ msgstr "nei"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Venn"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
 
-#~ msgid "Buddy List"
-#~ msgstr "Venneliste"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Beskrivelse: %s"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effekt: %s"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Forrige"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Ny"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Jobb-nivå: %d"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr ""
 
-#~ msgid "Magic"
-#~ msgstr "Magi"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr ""
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "To-håndsvåpen"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr ""
 
-#~ msgid "windowed"
-#~ msgstr "i vindu"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr ""
 
-#~ msgid "fullscreen"
-#~ msgstr "fullskjerm"
 
-#~ msgid "Weapons"
-#~ msgstr "Våpen"
diff --git a/po/nl.po b/po/nl.po
index f7d0660e0..e6452e090 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,128 +1,126 @@
-# Dutch translation of The Mana World.
-# Copyright (c) 2007 The Mana World Development Team
-# This file is distributed under the same license as the The Mana World package.
-# Bjørn Lindeijer <bjorn@lindeijer.nl>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: The Mana World 0.1.0\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2009-07-15 12:21+0000\n"
-"Last-Translator: Yentl <y.v.t@scarlet.be>\n"
-"Language-Team: Dutch\n"
-"Language: \n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1030
-#, fuzzy
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr "Zichtbare namen"
+msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:900
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Verbinden met de map server..."
+msgstr ""
 
-#: src/client.cpp:931
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Inloggen"
+msgstr ""
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1056
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Kies Personage"
+msgstr ""
 
-#: src/client.cpp:1087
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "Verbinden met de map server..."
+msgstr ""
 
-#: src/client.cpp:1097
-#, fuzzy
+#: src/client.cpp:1113
 msgid "Changing game servers"
-msgstr "Server"
+msgstr ""
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1177
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Wachtwoord:"
+msgstr ""
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1197
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Veranderen"
+msgstr ""
 
-#: src/client.cpp:1198
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "Lid is succesvol gepromoveerd."
+msgstr ""
 
-#: src/client.cpp:1218
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Registreren"
+msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1612
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Ongeldige updatahost: "
+msgstr ""
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -138,8 +136,8 @@ msgstr "Kan geen lege berichten sturen!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
 #: src/commandhandler.cpp:429
@@ -147,14 +145,13 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
 #: src/commandhandler.cpp:456
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Groepsnaam ontbreekt."
+msgstr ""
 
 #: src/commandhandler.cpp:469 src/commandhandler.cpp:576
 #: src/commandhandler.cpp:617 src/commandhandler.cpp:647
@@ -178,33 +175,31 @@ msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
 #: src/commandhandler.cpp:555
-#, fuzzy
 msgid "friend"
-msgstr "Vriend"
+msgstr ""
 
 #: src/commandhandler.cpp:560
 msgid "disregarded"
 msgstr ""
 
 #: src/commandhandler.cpp:565
-#, fuzzy
 msgid "neutral"
-msgstr "Neutraal"
+msgstr ""
 
 #: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
 #: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Groep succesvol aangemaakt."
+msgstr ""
 
 #: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
 #: src/commandhandler.cpp:628
 msgid "Player wasn't ignored!"
@@ -215,24 +210,20 @@ msgid "Player no longer ignored!"
 msgstr ""
 
 #: src/commandhandler.cpp:637
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
 #: src/commandhandler.cpp:654
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
 #: src/commandhandler.cpp:665
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Groep succesvol aangemaakt."
+msgstr ""
 
 #: src/commandhandler.cpp:667
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
 #: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
@@ -275,24 +266,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "font cache size"
-msgstr "Lettergrootte"
+msgstr ""
 
 #: src/commandhandler.cpp:1094
-#, fuzzy
 msgid "Cache size:"
-msgstr "Lettergrootte"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Aanmaken"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Verwijderen"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -305,113 +292,104 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
-#, fuzzy
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Screenshot opgeslagen naar ~/"
+msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:511
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
-"De verbinding met de server is verloren gegaan, het programma zal nu "
-"afsluiten"
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1425
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Kan de map niet laden"
+msgstr ""
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:108
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Groep (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:122
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:132
+#, c-format
 msgid "Guild: %s"
-msgstr "Guilds"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:146
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:156
+#, c-format
 msgid "Comment: %s"
-msgstr "Commando: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Gespreksvenster"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
-msgstr "Omhoog"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Kopen"
 
@@ -440,7 +418,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -451,31 +429,31 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -491,24 +469,22 @@ msgid "Account: %s"
 msgstr "Account: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Typ nieuw emailadres tweemaal:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Het nieuwe emailadres bestaat al."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -521,23 +497,22 @@ msgid "Password:"
 msgstr "Wachtwoord:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Typ nieuw wachtwoord tweemaal:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -567,14 +542,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Haarkleur:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Haarstijl:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -633,82 +606,71 @@ msgid "Unregister"
 msgstr "Registreren"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Emailadres wijzigen"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Onjuist wachtwoord"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Kon personage niet verwijderen."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Onjuist wachtwoord"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Sluiten"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Standaard"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Vriend"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Groen: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Blauw: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "laag"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hyperlink"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -719,30 +681,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Geworpen"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Regenboog"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Regenboog"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Regenboog"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -750,12 +708,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:589
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d spelers zijn aanwezig."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -769,61 +727,53 @@ msgid "No"
 msgstr "Nee"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
-#, fuzzy
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
-msgstr "Genegeerd"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Map"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Naar links"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Volgende"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Onderwerp: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Naam: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "Kaartje"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Aangepaste cursor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Speler raakt Monster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Deeltjes effecten"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -855,51 +805,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Deeltjes effecten"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Naar links"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Speler viseren"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Speler viseren"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Speler viseren"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Speler viseren"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Aanval %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Kaartje"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -908,9 +851,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Kritieke aanval"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -932,28 +874,25 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Vorige"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Volgende"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
@@ -961,10 +900,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -972,84 +911,80 @@ msgstr "Afdoen"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "Sloten:"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-#, fuzzy
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
-msgstr "Poort:"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:121
-#, fuzzy
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
-msgstr "een"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-#, fuzzy
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
-msgstr "een"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Neerleggen"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1087,107 +1022,103 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Onbekende foutmelding"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Gewicht "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Statusvenster"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Reset"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Reset"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Prijs: %s / Totaal: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1196,9 +1127,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Sluiten"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1218,9 +1148,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Onthoud Naam"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1231,18 +1160,16 @@ msgid "Register"
 msgstr "Aanmelden"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
 #: src/gui/ministatus.cpp:59
 msgid "health bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:65
-#, fuzzy
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
 #: src/gui/ministatus.cpp:77
 msgid "experience bar"
@@ -1253,27 +1180,24 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:92
-#, fuzzy
 msgid "weight bar"
-msgstr "Gewicht "
+msgstr ""
 
 #: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:98
-#, fuzzy
 msgid "money bar"
-msgstr "Monster raakt Speler"
+msgstr ""
 
 #: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:104
-#, fuzzy
 msgid "status bar"
-msgstr "Status"
+msgstr ""
 
 #: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
@@ -1292,18 +1216,17 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
-msgstr "Sluiten"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Volgende"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1323,360 +1246,329 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Geld: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Afdoen"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
-msgstr "Fluister"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
-#, fuzzy
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
-msgstr "Vriend"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
-#, fuzzy
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
-msgstr "Genegeerd"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "Voltooid"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
-#, fuzzy
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
-msgstr "laag"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
-#, fuzzy
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
-msgstr "Emailadres wijzigen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
-#, fuzzy
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
-msgstr "Kick gefaald!"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
-#, fuzzy
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
-msgstr "Kick gefaald!"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
-#, fuzzy
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
-msgstr "Veranderen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
-#, fuzzy
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
-#, fuzzy
 msgid "Kick player"
-msgstr "Kick gefaald!"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
-msgstr "Naam tonen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
-#, fuzzy
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
-msgstr "@@attack|%s aanvallen@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:296
-#, fuzzy
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
-msgstr "@@attack|%s aanvallen@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:299
-#, fuzzy
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:461
-#, fuzzy
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
-msgstr "Oprapen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
-msgstr "Onthoud Naam"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
-#, fuzzy
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
-msgstr "Onthoud Naam"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
-#, fuzzy
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
-msgstr "Tab Accentuering"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:545
-#, fuzzy
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
-msgstr "Tab Accentuering"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
-msgstr "Onthoud Naam"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
-msgstr "Kan niets kopen."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
-msgstr "Handelen inschakelen/uitschakelen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Groot"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:715
-#, fuzzy
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
-msgstr "Veranderen"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
-#, fuzzy
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
-msgstr "Handel goedkeuren"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
-#, fuzzy
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
-#, fuzzy
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
-#, fuzzy
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
-#, fuzzy
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1567
-#, fuzzy
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1569
-#, fuzzy
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
-msgstr "Opslaan"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
-msgstr "Neerleggen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
-msgstr "Afhalen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1611
-#, fuzzy
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
-msgstr "Afhalen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
-#, fuzzy
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
-msgstr "Afhalen"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Standaard"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
-#, fuzzy
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
-msgstr "Omhoog"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
-#, fuzzy
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
-msgstr "Omlaag"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
@@ -1723,14 +1615,12 @@ msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #: src/gui/serverdialog.cpp:228
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Kies jouw server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Kies jouw server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1741,23 +1631,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:287
-#, fuzzy
 msgid "Connect"
-msgstr "Verbinden..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:288
-#, fuzzy
 msgid "Custom Server"
-msgstr "Aangepaste cursor"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
@@ -1769,9 +1656,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:556
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Wachten op server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
@@ -1803,14 +1689,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Joystick activeren"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Joystick activeren"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1829,9 +1713,8 @@ msgid "Music volume"
 msgstr "Muziek volume"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Geen tekst"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1841,67 +1724,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Kleuren"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-#, fuzzy
-msgid "Enable trade tab"
-msgstr "Kan niets kopen."
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Kan niets kopen."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:91
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Naam tonen"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:94
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Volgende chattab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1909,14 +1820,9 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Kleuren"
-
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Type: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1938,39 +1844,34 @@ msgid "Spectrum"
 msgstr "Spectrum"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Vertraging: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Rood: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Groen: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Blauw: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -2007,9 +1908,8 @@ msgid "Assign"
 msgstr "Toewijzen"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Toewijzen"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2023,487 +1923,515 @@ msgstr "Conflict(en) tussen toetsen gevonden."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monsters"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Kan niets kopen."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Accentueren"
+msgid "Show monster hp bar"
+msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-#, fuzzy
-msgid "Highlight floor items"
-msgstr "Accentueren"
-
 #: src/gui/setup_other.cpp:67
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Joystick activeren"
+msgid "Show warps particles"
+msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-#, fuzzy
-msgid "Show warps particles"
-msgstr "als deeltje"
+msgid "Highlight floor items"
+msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Naam tonen"
+msgid "Moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
-#, fuzzy
-msgid "Show own hp bar"
-msgstr "Naam tonen"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Joystick activeren"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-#, fuzzy
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
-msgstr "Bericht"
+msgstr ""
 
-#: src/gui/setup_other.cpp:114
-#, fuzzy
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr "Kan niets kopen."
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
 
-#: src/gui/setup_other.cpp:117
-#, fuzzy
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr "Handelen inschakelen/uitschakelen"
+msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
-#, fuzzy
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
-msgstr "Kan niets kopen."
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Spelers"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Zichtbare namen"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relatie"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Vriend"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Naam tonen"
-
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Spelers"
-
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_players.cpp:313
-#, fuzzy
-msgid "Show level"
-msgstr "Naam tonen"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:317
-#, fuzzy
-msgid "Show own name"
-msgstr "Naam tonen"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:321
-#, fuzzy
-msgid "Target dead players"
-msgstr "Speler viseren"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:325
-#, fuzzy
-msgid "Secure trades"
-msgstr "Handel goedkeuren"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-#, fuzzy
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
-msgstr "Deeltjes effecten"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-#, fuzzy
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr "Help"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
-msgstr "Handel goedkeuren"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:241
-#, fuzzy
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr "Veranderen"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Klein"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Klein"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Middelmatig"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Groot"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-#, fuzzy
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:224
-#, fuzzy
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Geen tekst"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bellen met namen"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "gemiddeld"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:328
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Relatie"
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Zichtbare namen"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Joystick activeren"
-
-#: src/gui/setup_video.cpp:353
-#, fuzzy
-msgid "Show background"
-msgstr "Achtergrond"
-
-#: src/gui/setup_video.cpp:358
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS limiet:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
-#, fuzzy
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr "FPS limiet:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:380
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Deeltjes details"
-
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Lettergrootte"
+msgstr ""
 
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nee"
+msgstr ""
 
-#: src/gui/setup_video.cpp:583
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "modus en herstel van oude modus ook gefaald!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:589
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "modus en herstel van oude modus ook gefaald!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:600
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Overgaan naar volledig scherm"
+msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:613
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Veranderen van OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Schermresolutie veranderd"
+msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Deeltjes effecten instellingen gewijzigd."
+msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2520,7 +2448,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -2532,15 +2460,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2551,31 +2479,31 @@ msgid "Up"
 msgstr "Omhoog"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Vaardigheidspunten: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Vaardigheidspunten: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Vaardigheden"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
@@ -2585,9 +2513,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Guild aangemaakt."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2599,23 +2527,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Guild aanmaken"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Weet u zeker dat u wilt afsluiten?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groep"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Een gebruiker uitnodigen in de groep"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2623,9 +2550,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2637,75 +2563,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Weet u zeker dat u wilt afsluiten?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Aanvallen"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Aanvallen"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Genegeerd"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Personage Aanmaken"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Gebruiker uitnodigen"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Uitnodiging van %s aanvaard."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Uitnodiging van %s geweigerd."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Uitnodiging van %s aanvaard."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Uitnodiging van %s geweigerd."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Fout bij het creëren van guild."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2713,43 +2634,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Guild"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Kies jouw server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Groepsuitnodiging aanvaarden"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2770,263 +2686,254 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Groep"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Kies jouw server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Naar links"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Naar links"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Aanvallen"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Van personage wisselen"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Van personage wisselen"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Van personage wisselen"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Toetsenbord"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3064,19 +2971,19 @@ msgid "Job:"
 msgstr "Job:"
 
 #: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Attributen van personage OK"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Level: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Vaardigheidspunten: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
 #: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
@@ -3205,99 +3112,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Naar links"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Handelen toestaan"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Naar links"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Algemeen"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magie"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magie"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Commando: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magie"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Commando: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Speler viseren"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Maximum level"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Naam tonen"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3321,26 +3216,27 @@ msgstr "Goedgekeurd. Wachten..."
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "Jij krijgt %s."
+msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in"
+" het venster."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
@@ -3361,22 +3257,21 @@ msgstr "Verbinden..."
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 je later opnieuw probeert"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3385,23 +3280,20 @@ msgid "Being"
 msgstr "Wezen"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Vriend"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
 msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Genegeerd"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM Namen"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3419,28 +3311,21 @@ msgstr "GM Namen"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monsters"
-
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Monster raakt Speler"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Groep"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Guild"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3455,42 +3340,36 @@ msgid "Exp Notification"
 msgstr "Ervaring Notificatie"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Monster raakt Speler"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Speler raakt Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Monster raakt Speler"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Namen van andere Spelers"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Speler raakt Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Speler raakt Monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3501,29 +3380,24 @@ msgid "Misses"
 msgstr "Missers"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Tab Accentuering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Accentueren"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Accentueren"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Accentueren"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Tab Accentuering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3534,9 +3408,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Monster raakt Speler"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3550,23 +3423,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3633,7 +3506,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
@@ -3671,9 +3544,9 @@ msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s fluistert: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3696,34 +3569,29 @@ msgid "This command closes the current whisper tab."
 msgstr "Dit commando sluit de huidige fluistertab."
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Commando: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Commando: /item <beleid>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
-"Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Gespreksvenster"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3738,9 +3606,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Smilie"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3775,9 +3642,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Sneltoets"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3800,23 +3666,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "OK selecteren"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Veranderen"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Kies jouw server"
+msgstr ""
 
 #: src/inventory.cpp:248
 msgid "Storage"
-msgstr "Opslag"
+msgstr ""
 
 #: src/inventory.cpp:250
 msgid "Cart"
@@ -3843,9 +3706,8 @@ msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Naar links"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3872,9 +3734,8 @@ msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Dichtstbijzijnde viseren"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3909,14 +3770,12 @@ msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Emailadres wijzigen"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Snelkopeling naar voorwerp %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -3928,7 +3787,7 @@ msgstr "Snelkopeling naar voorwerp %d"
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkopeling naar voorwerp %d"
@@ -3974,43 +3833,36 @@ msgid "Debug Window"
 msgstr "Debugvenster"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Vaardigheidsvenster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Statusvenster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Instellingenvenster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Vensters verbergen"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Statusvenster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Commando: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Gespreksvenster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4021,14 +3873,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Vorige chattab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Volgende chattab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4052,7 +3902,7 @@ msgstr "Volgende chattab"
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
@@ -4089,219 +3939,205 @@ msgstr "Vorige chattab"
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr "Vorige chattab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:279
-#, fuzzy
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr "Volgende chattab"
+msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
-#, fuzzy
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr "Omlaag"
+msgstr ""
 
-#: src/keyboardconfig.cpp:295
-#, fuzzy
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr "Naar links"
+msgstr ""
 
-#: src/keyboardconfig.cpp:296
-#, fuzzy
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr "Naar rechts"
+msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
-#, fuzzy
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr "Van personage wisselen"
+msgstr ""
 
-#: src/keyboardconfig.cpp:316
-#, fuzzy
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
-#, fuzzy
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr "Viseren en Aanvallen"
+msgstr ""
 
-#: src/keyboardconfig.cpp:322
-#, fuzzy
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr "Wijzig wachtwoord"
+msgstr ""
 
-#: src/keyboardconfig.cpp:324
-#, fuzzy
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr "Emailadres wijzigen"
+msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
-#, fuzzy
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr "Handelen inschakelen/uitschakelen"
+msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
+msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
-#, fuzzy
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
-msgstr "Kan het voorwerp niet oprapen."
+msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
-#, fuzzy
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
-msgstr "Server is volzet"
+msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
-#, fuzzy
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
-msgstr "Kan het voorwerp niet oprapen."
+msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
-#, fuzzy, c-format
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Je raapte %s [@@%d|%s@@] op."
-msgstr[1] "Je raapte %s [@@%d|%s@@] op."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
-#, fuzzy
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
-msgstr "Handel geannuleerd."
+msgstr ""
 
-#: src/localplayer.cpp:3455
-#, fuzzy
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
-msgstr "Emailadres wijzigen"
+msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
-#, fuzzy
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
-msgstr "Handel geannuleerd."
+msgstr ""
 
-#: src/localplayer.cpp:3817
-#, fuzzy
+#: src/localplayer.cpp:3849
 msgid "You see "
-msgstr "Jij krijgt %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4324,93 +4160,76 @@ msgid "Options:"
 msgstr "Opties:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Gebruikte configuratiebestand"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Gebruikte configuratiebestand"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Versie weergeven"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Deze help weergeven"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Gebruikte configuratiebestand"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Login met deze gebruikersnaam"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Login met dit wachtwoord"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Login met dit personage"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Loginserver naam of IP-adres"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Loginserver poort"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Gebruik deze updatehost"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Kies standaard personageserver en personage"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Sla update downloads over"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Map waarvan speldata geladen wordt"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Map te gebruiken als home"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Map te gebruiken als home"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL uitschakelen voor deze sessie"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4424,1995 +4243,1231 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Kracht"
-
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Kracht %+d"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Behendigheid"
-
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Behandigheid %+d"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Vaardigheid"
-
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Vaardigheid %+d"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Vitaliteit"
-
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitaliteit %+d"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Intelligentie"
-
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligentie %+d"
-
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Wilskracht:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Wilskracht %+d"
-
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Je bent dood."
-
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"We betreuren het om je te melden dat jouw personage is gestorven in een "
-"gevecht."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Je bent niet langer levend."
-
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
-
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
-"naar een beter plaats gegaan."
-
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
-"te slaan is mislukt."
-
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Dit verliep niet zoals gepland."
-
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
-
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Verslagen"
-
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
-
-#: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Druk op OK om te respawnen"
-
-#: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
-msgid "You Died"
-msgstr "Je stierf"
-
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
-msgid "Not logged in."
-msgstr "Reeds aangemeld"
-
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Gebruikersnaam bestaat al"
-
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Attributen van personage OK"
-
-#: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Attributen van personage OK"
-
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-#, fuzzy
-msgid "Unknown error."
-msgstr "Onbekende foutmelding"
-
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Info"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personage verwijderd."
-
-#: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Selecteer het aantal exemplaren om te verhandelen"
-
-#: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Onbekende foutmelding"
-
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "Geen gameservers beschikbaar."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Onderwerp: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Speler raakt Monster"
-
-#: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Commando: /join <kanaal>"
-
-#: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
-msgid "Listing channels."
-msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s heeft zich bij de groep gevoegd."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Onbekend commando."
-
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "Guild aangemaakt."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Fout bij het creëren van guild."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Uitnodiging verzonden."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Lid is succesvol gepromoveerd."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Kon lid niet promoveren."
-
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Verkeerd magie_teken"
-
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
-msgid "Already logged in."
-msgstr "Reeds aangemeld"
-
-#: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
-msgid "Account banned."
-msgstr "Account verlopen"
-
-#: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nieuw wachtwoord is incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Oud wachtwoord incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
-msgstr "Account niet verbonden. Log eerst in aub."
-
-#: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nieuw emailadres is incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Oud emailadres is incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Het nieuwe emailadres bestaat al."
-
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Te oude Client versie"
-
-#: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
-
-#: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
-msgid "Account banned"
-msgstr "Account verlopen"
-
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Verkeerde gebruikersnaam, wachtwoord of emailadres"
-
-#: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
-msgid "Username already exists."
-msgstr "Gebruikersnaam bestaat al"
-
-#: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
-msgid "Email address already exists."
-msgstr "emailadres bestaat al"
-
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Bijgevoegd bij groep."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s heeft zich bij de groep gevoegd."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s wees jouw uitnodiging af."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Inkomende handelsaanvragen accepteren."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Inkomende handelsaanvragen negeren."
-
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handelen met %s"
-
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
-
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Handel voltooid."
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Kick gefaald!"
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Kick succesvol!"
-
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Bedankt voor het verkopen."
-
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Kan niets verkopen."
-
-#: src/net/tmwa/buysellhandler.cpp:138
-#, fuzzy
-msgid "Unable to sell while trading."
-msgstr "Kan niets verkopen."
-
-#: src/net/tmwa/buysellhandler.cpp:141
-#, fuzzy
-msgid "Unable to sell unsellable item."
-msgstr "Kan het voorwerp niet oprapen."
-
-#: src/net/tmwa/charserverhandler.cpp:121
+#: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
-msgstr "Kan deze ID niet gebruiken"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr "Onbekende foutmelding"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr "Verkeerd magie_teken"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr "Personage verwijderd."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr "Kon personage niet verwijderen."
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Sterkte:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Agiliteit:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Vitaliteit:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Intelligentie:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Dexteriteit:"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Geluk:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:128
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Fluisterbericht kon niet verzonden worden, gebruiker is offline."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:136
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Speler"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-#, fuzzy
+#: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr "Speler"
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "Kanalen worden niet ondersteund!"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Naam"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr "Handel aanvragen"
-
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Kracht %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
-#, c-format
-msgid "Agility %+d"
-msgstr "Behandigheid %+d"
-
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitaliteit %+d"
-
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligentie %+d"
-
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Vaardigheid %+d"
-
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Geluk %+d"
-
-#: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Authenticatie mislukt"
-
-#: src/net/tmwa/generalhandler.cpp:141
-#, fuzzy
-msgid "No servers available."
-msgstr "Geen servers beschikbaar"
-
-#: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Iemand anders probeert deze account te gebruiken"
-
-#: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Deze account is reeds aangemeld"
-
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Speedhack gedetecteerd"
-
-#: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
-msgid "Duplicated login."
-msgstr "Dubbele login"
-
-#: src/net/tmwa/generalhandler.cpp:157
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Onbekenden connectiefout"
-
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "De verbinding met de server werd verbroken!"
-
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Geluk"
-
-#: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
-msgid "Defense"
-msgstr "Verdediging:"
-
-#: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
-msgid "M.Attack"
-msgstr "Magische Aanval:"
-
-#: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
-msgid "M.Defense"
-msgstr "Magische Verdediging:"
-
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy, no-c-format
-msgid "% Accuracy"
-msgstr "% Nauwkeurigheid:"
-
-#: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
-msgid "% Evade"
-msgstr "% Ontwijking:"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
-msgid "% Critical"
-msgstr "Kritieke aanval"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-#, fuzzy
-msgid "Attack Delay"
-msgstr "Aanval %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
-msgid "Walk Delay"
-msgstr "Aanval %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
-msgid "Attack Range"
-msgstr "Monster raakt Speler"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Geeft deze help weer."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Nodig een speler uit voor jouw groep"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Verlaat de groep waarin je je bevindt"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Commando: /invite <nick>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Commando: /leave"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guild aangemaakt."
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Fout bij het creëren van guild."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
+#: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "Onbekend uitnodigingsantwoord van %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
 msgid "Guild name: %s"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
 msgid "Guild master: %s"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
 msgid "Guild level: %d"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
 msgid "Average level: %d"
-msgstr "Maximum level"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Guild"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "Guild aangemaakt."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
 msgid "Guild castle: %s"
-msgstr "Guild aangemaakt."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s is nu een lid van jouw groep."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "Onbekend uitnodigingsantwoord van %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr "Je hebt de groep verlaten."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s heeft jouw groep verlaten."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
+#: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s is nu een lid van jouw groep."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Nodig een speler uit voor jouw groep"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > Verlaat de groep waarin je je bevindt"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "Commando: /item <beleid>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
-"\", \"false\"."
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "Commando: /item"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
-"Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
 
-#: src/net/tmwa/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "Commando: /exp <beleid>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
-"\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
-"\"false\", \"no\"."
 
-#: src/net/tmwa/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "Commando: /exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "Voorwerpdeling ingeschakeld."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "Voorwerpdeling uitgeschakeld."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "Voorwerpdeling is niet mogelijk."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:157
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Voorwerpdeling ingeschakeld."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "Ervaringsdeling ingeschakeld."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "Ervaringsdeling uitgeschakeld."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "Ervaringsdeling is niet mogelijk."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:196
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "Ervaringsdeling ingeschakeld."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "Kan voorwerp niet gebruiken."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "Kan dit niet uitrusten."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:93
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "Nieuw wachtwoord is te kort"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Ongeregistreerde ID"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Onjuist wachtwoord"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "Account verlopen"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Geweerd van server"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Je bent permanent geband van het spel. Neem aub contact op met het GM team."
 
-#: src/net/tmwa/loginhandler.cpp:180
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Te oude Client versie"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Je bent tijdelijk geband van het spel tot %s.\n"
-"Neem aub contact op met het GM team via de forums."
 
-#: src/net/tmwa/loginhandler.cpp:190
+#: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr "Deze gebruikersnaam bestaat al"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr "Gebruikersnaam bestaat al"
-
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kan niets verkopen."
-
-#: src/net/tmwa/network.cpp:426
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Verbinden met de map server..."
-
-#: src/net/tmwa/partyhandler.cpp:86
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "Kan geen groep aanmaken."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "Groep succesvol aangemaakt."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s heeft jouw groep verlaten."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s is al een lid van een groep."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s wees jouw uitnodiging af."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s is nu een lid van jouw groep."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Onbekend uitnodigingsantwoord van %s."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "Je hebt de groep verlaten."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s heeft jouw groep verlaten."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "Een onbekend lid probeerde te zeggen: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s is niet in jouw groep!"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "Je bent dood."
+
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"We betreuren het om je te melden dat jouw personage is gestorven in een "
+"gevecht."
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "Je bent niet langer levend."
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "Werp een muntstuk in om verder te spelen."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
+"naar een beter plaats gegaan."
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
+"te slaan is mislukt."
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "Dit verliep niet zoals gepland."
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Verslagen"
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
+
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "Je bent niet langer."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "Je hebt opgehouden te zijn."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "Je bent stokstijf."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "Beroofd van het leven, rust je in vrede."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "Jouw metabolische processen behoren nu tot het verleden."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "Je bent een ex-speler."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "Bericht"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
-"herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:353
-#, fuzzy
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
-"herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "Je raapte op: "
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
 msgid "You spent %s."
-msgstr "Jij krijgt %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Handel mislukte!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Emoticon gefaald!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Zitten niet mogelijk!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Chatcreatie mislukte!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Kan je niet bij de groep voegen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:173
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Kan niet roepen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Je hebt nog geen hoog genoeg level bereikt!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Onvoldoende leven!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Onvoldoende Vaardigheidspunten!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "Je hebt geen memo's!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "Je kan dat nu niet doen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Je hebt een andere rode edelsteen nodig!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:212
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Je hebt een andere blauwe edelsteen nodig!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:215
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Je draagt teveel bij je om dit te doen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Huh? Wat is dat?"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Warp mislukt..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Kon niets stelen..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Gif had geen effect..."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
+
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handelen is niet mogelijk. Partner is te ver weg."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handelen is niet mogelijk. Personage bestaat niet."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel onderbroken vanwege een onbekende reden."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Handelen: Jij en %s"
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Handel met %s geannuleerd."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "Onbehandelde handelannulatiepakket."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
 
-#: src/net/tmwa/tradehandler.cpp:264
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
-
-#: src/playerrelations.cpp:414
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:434
-msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:481
-msgid "Floating bubble"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
-#: src/resources/monsterdb.cpp:84
-msgid "unnamed"
-msgstr "naamloos"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel voltooid."
 
-#: src/resources/itemdb.cpp:62
-#, c-format
-msgid "Attack %+d"
-msgstr "Aanval %+d"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Kracht"
 
-#: src/resources/itemdb.cpp:63
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "Defense %+d"
-msgstr "Verdediging %+d"
+msgid "Strength %+.1f"
+msgstr ""
 
-#: src/resources/itemdb.cpp:64
-#, c-format
-msgid "HP %+d"
-msgstr "Leven %+d"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Behendigheid"
 
-#: src/resources/itemdb.cpp:65
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "MP %+d"
-msgstr "Magie %+d"
-
-#: src/resources/itemdb.cpp:168
-msgid "Unknown item"
-msgstr "Onbekend voorwerp"
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Level: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "Ervaring:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Naar links"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Attributen van personage OK"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Smilie"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Handelen met %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|%s aanvallen@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Gebruiken@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Annuleren@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Gebruiken@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "Voltooid"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Gebruiken@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|%s aanvallen@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuleren@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|%s oppakken@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Gebruiken@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "OK selecteren"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Help --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Deze help weergeven"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Mapnaam weergeven"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Aantal online gebruikers weergeven"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Vertel iets over jezelf"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Maak dit venster leeg"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Zend een privébericht naar een gebruiker"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > zelfde functie als msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > zelfde als msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr ""
-#~ "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > zelfde functie als query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Sluit de fluistertab"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Alle publieke kanalen weergeven"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Een kanaal creëren of bij aansluiten"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Creëer een nieuwe groep"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Creëer een nieuwe groep"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
-#~ "chatlog, als logging aanstaat)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Globale aankondiging (enkel GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Sluit de fluistertab"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Zend een privébericht naar een gebruiker"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Voor meer informatie, typ /help <commando>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Commando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Commando: /help <commando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Dit commando geeft help weer van <commando>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Commando: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** enkel mogelijk door een GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Commando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Commando: /item <beleid>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Commando: /join <kanaal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Dit commando voegt je toe op kanaal <kanaal>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Dit commando geeft een lijst weer van alle kanalen."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Commando /me <bericht>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Commando: /msg <nick> <bericht>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Commando: /msg <nick> <bericht>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Commando: /w <nick> <bericht>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Commando: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Commando: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Dit commando probeert een tabblad aan te maken voor alle whispers tussen "
-#~ "jou en <nick>"
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Commando: /w <nick> <bericht>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Commando: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Dit commando zet het onderwerp naar <bericht>."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Commando: /create <groepsnaam>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Commando: /create <groepsnaam>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Commando: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Commando: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Dit commando haalt een lijst op van spelers die je kunnen horen en zendt "
-#~ "dit naar ofwel het logboek als dit opgeslagen wordt, of anders naar de "
-#~ "chatlog."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Commando: /toggle <status>"
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of "
-#~ "\"0\", \"no\", \"false\" om het uit te schakelen."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Commando: /toggle"
-
-#~ msgid "Command: /where"
-#~ msgstr "Commando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Dit commando geeft de naam weer van de huidige map."
-
-#~ msgid "Command: /who"
-#~ msgstr "Commando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Type /help voor een lijst van commando's."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Deeltjes details"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Omgevingseffecten"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Emoticon snelkoppeling %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Speler raakt Monster"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Onderwerp: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Naam: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Kaartje"
+msgid "Agility %+.1f"
+msgstr ""
 
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > De chat beginnen opnemen naar een extern bestand"
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Vaardigheid"
 
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Commando: /record <bestandsnaam>"
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
 
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Dit commando begint de chat log op te slaan naar het bestand "
-#~ "<bestandsnaam>."
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitaliteit"
 
-#~ msgid "Command: /record"
-#~ msgstr "Commando: /record"
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
 
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Dit commando beëindigt het opslaan van de chatlog."
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligentie"
 
-#~ msgid "Attendance written to record log."
-#~ msgstr "Aanwezigheid geschreven in logbestand."
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#~ msgid "Finishing recording."
-#~ msgstr "Opname voltooid."
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
 
-#~ msgid "Not currently recording."
-#~ msgstr "Momenteel niet aan het opnemen."
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
 
-#~ msgid "Already recording."
-#~ msgstr "Reeds aan het opnemen."
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
 
-#~ msgid "Starting to record..."
-#~ msgstr "Opname starten..."
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
 
-#~ msgid "Failed to start recording."
-#~ msgstr "Kan de opname niet starten."
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
 
-#~ msgid "Recording..."
-#~ msgstr "Opnemen..."
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
 
-#~ msgid "Stop recording"
-#~ msgstr "Stoppen met opnemen"
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
 
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Pad naar Muis vinden"
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
 
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "Leven:"
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
 
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "Magie:"
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Ervaring:"
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Geld: %d"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Job:"
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Level: %d"
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Groep succesvol aangemaakt."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr ""
-#~ "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Gebruikte configuratiebestand"
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
 
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Gebruikte configuratiebestand"
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
 
-#~ msgid "Sound"
-#~ msgstr "Geluid"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Geen gameservers beschikbaar."
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Toegang geweigerd"
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr "Onderwerp: %s"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Onbekende fout bij het selecteren van personage"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Op deze manier iemand uitnodigen wordt momenteel niet ondersteund."
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#~ msgid "Willpower:"
-#~ msgstr "Wilskracht:"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Handelen met %s"
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Fluister"
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "%s is niet in jouw groep!"
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "Monsters"
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Oprapen"
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Kan geen leeg chatbericht sturen!"
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Fout bij het creëren van guild."
 
-#~ msgid "Text Shadow"
-#~ msgstr "Tekstschaduw"
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Uitnodiging verzonden."
 
-#~ msgid "Text Outline"
-#~ msgstr "Tekstuitlijning"
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr "Lid is succesvol gepromoveerd."
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Vooruitgangsbalk Labels"
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr "Kon lid niet promoveren."
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Voorwerp te duur"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Voorwerp wordt al gedragen"
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#~ msgid "Player"
-#~ msgstr "Speler"
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#~ msgid "Is"
-#~ msgstr "is gelijk aan"
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Account niet verbonden. Log eerst in aub."
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Onbekend type voorwerp"
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
 
-#~ msgid "Generics"
-#~ msgstr "Generiek"
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#~ msgid "Hats"
-#~ msgstr "Hoeden"
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#~ msgid "Usables"
-#~ msgstr "Gebruiksvoorwerpen"
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
 
-#~ msgid "Shirts"
-#~ msgstr "Shirts"
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
 
-#~ msgid "Pants"
-#~ msgstr "Broeken"
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#~ msgid "Shoes"
-#~ msgstr "Schoenen"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#~ msgid "Shields"
-#~ msgstr "Schilden"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#~ msgid "Rings"
-#~ msgstr "Ringen"
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#~ msgid "Necklaces"
-#~ msgstr "Kettingen"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
 
-#~ msgid "Arms"
-#~ msgstr "Wapens"
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunitie"
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr "Bijgevoegd bij groep."
 
-#~ msgid "HP Bar"
-#~ msgstr "Levensbalk"
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s heeft zich bij de groep gevoegd."
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Levensbalk"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Levensbalk"
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Inkomende handelsaanvragen accepteren."
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Levensbalk"
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Inkomende handelsaanvragen negeren."
 
-#~ msgid "no"
-#~ msgstr "nee"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Handelen met %s"
 
-#~ msgid "Buddy"
-#~ msgstr "Vriend"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Kick gefaald!"
 
-#~ msgid "Buddy List"
-#~ msgstr "Vriendenlijst"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Kick succesvol!"
 
-#~ msgid "Description: %s"
-#~ msgstr "Beschrijving: %s"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Bedankt voor het verkopen."
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effect: %s"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Kan niets verkopen."
 
-#~ msgid "New"
-#~ msgstr "Nieuw"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Beroep niveau: %d"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#~ msgid "Present: "
-#~ msgstr "Aanwezig: "
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Kracht %+d"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Guild verlaten"
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Behandigheid %+d"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitaliteit %+d"
 
-#~ msgid "Recent:"
-#~ msgstr "Recent:"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligentie %+d"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Uitrusten@@"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Vaardigheid %+d"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Neerleggen@@"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Geluk %+d"
 
-#~ msgid "Select Server"
-#~ msgstr "Server Selecteren"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Kan niet wisselen naar "
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "windowed"
-#~ msgstr "in venster"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "fullscreen"
-#~ msgstr "volledig scherm"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Weapons"
-#~ msgstr "Wapens"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Stats"
-#~ msgstr "statistieken"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Totaal"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Kosten"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "De verbinding met de server werd verbroken!"
 
-#~ msgid "Attack:"
-#~ msgstr "Aanval:"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Geluk"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflex:"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Overblijvende statuspunten: %d"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Buddys"
-#~ msgstr "Vrienden"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Party Window"
-#~ msgstr "Groepsvenster"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Unarmed"
-#~ msgstr "Ongewapend"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "Mes"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Zwaard"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Staf"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Zweep"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Boog"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Shooting"
-#~ msgstr "Schieten"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Mace"
-#~ msgstr "Goedendag"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s is niet in jouw groep!"
 
-#~ msgid "Axe"
-#~ msgstr "Bijl"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Onbekende vaardigheid"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan niet gecreëerd worden, maar het bestaat niet! Verlaten."
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kan niet instellen van "
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid " video mode: "
-#~ msgstr " video modus: "
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "naamloos"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Verbinden met de karakter server..."
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Aanval %+d"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Verbinden met de account server..."
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Verdediging %+d"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Zelfde functie als create"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "Leven %+d"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Commando: /new <groepsnaam>"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "Magie %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "Naamloos"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Onbekend voorwerp"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll radius"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll vertraging"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 66bae7216..15fa66fb7 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-17 21:39+0000\n"
+"Last-Translator: AL13N <maarten.vanraes@gmail.com>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
 "Language: nl_BE\n"
@@ -21,107 +21,108 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr ""
+msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, 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."
@@ -134,7 +135,7 @@ msgstr "Onbekend commando."
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,152 +144,152 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d week"
+msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dag"
+msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d uur"
+msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuut"
+msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d seconde"
+msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr ""
+msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr ""
+msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -298,102 +299,102 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Pvp rang: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bot Controleerder"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Beweeg"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultaat"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kopen"
 
@@ -407,7 +408,7 @@ msgstr "Prijs: %s / Totaal: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -415,30 +416,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -447,19 +448,19 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -555,7 +556,7 @@ msgstr "Haarstijl:"
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
-msgstr ""
+msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
 #: src/gui/socialwindow.cpp:1033
@@ -615,19 +616,19 @@ msgstr "Wijzig Email"
 
 #: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
-msgstr ""
+msgstr "Ongeldig paswoord"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
-msgstr ""
+msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -701,10 +702,10 @@ msgid "rainbow 3"
 msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -712,12 +713,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -730,25 +731,25 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Negeer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Map"
 
 #: src/gui/debugwindow.cpp:71
 msgid "Target"
-msgstr ""
+msgstr "Doel"
 
 #: src/gui/debugwindow.cpp:72
 msgid "Net"
-msgstr ""
+msgstr "Net"
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
@@ -841,7 +842,7 @@ msgstr "Doel Gilde:"
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
 msgid "Attack delay:"
-msgstr ""
+msgstr "Aanvalsvertraging:"
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
@@ -875,39 +876,39 @@ msgstr "Uitvoer: %d bytes/sec"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "< Vorig"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "Volgend >"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -916,7 +917,7 @@ msgid "Help"
 msgstr "Help"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -945,31 +946,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -978,17 +979,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1038,91 +1039,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Herzet statistieken"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Herzet timer"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  Tijd tot volgend niveau: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1142,7 +1143,7 @@ msgstr "Overslaan"
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1167,43 +1168,43 @@ msgstr "Aanmelden"
 msgid "Change Server"
 msgstr "Wijzig Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Nood"
 
@@ -1220,17 +1221,17 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Wissen"
 
 #: src/gui/npcdialog.cpp:222
 msgid "> Next"
-msgstr ""
+msgstr "> Volgende"
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1262,328 +1263,328 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr ""
+msgstr "Word vriend"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
-msgstr ""
+msgstr "Geen rekening mee houden"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
-msgstr ""
+msgstr "Wis"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
-msgstr ""
+msgstr "Volledig genegeerd"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr ""
+msgstr "Volg"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
-msgstr ""
+msgstr "Imiteer"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr ""
+msgstr "Schop speler"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
-msgstr ""
+msgstr "ontkleed"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
-msgstr ""
+msgstr "Koop (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
-#, fuzzy
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr "Verkopen"
+msgstr "Verkoop (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
-msgstr ""
+msgstr "Schop"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr ""
+msgstr "Raap op"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr ""
+msgstr "Hernoem"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
+msgstr "Verwijder"
+
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
-msgstr ""
+msgstr "Inladen oude kleren"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
-msgstr ""
+msgstr "Laad oude spreuken"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
-msgstr ""
+msgstr "Wijzig spreuk"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
-msgstr ""
+msgstr "De naam niet verwijderen"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
-msgstr ""
+msgstr "Verwijder naam"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr ""
+msgstr "away aanzetten"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
-msgstr ""
+msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr ""
+msgstr "Laat alles vallen"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
-msgstr ""
+msgstr "Verberg"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
-msgstr ""
+msgstr "Toon"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
-msgstr ""
+msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
-msgstr ""
+msgstr "(standaard)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr ""
+msgstr "Beweeg naar boven"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
-msgstr ""
+msgstr "Beweeg naar beneden"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Status bewaren"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -1619,65 +1620,64 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
-#: src/gui/serverdialog.cpp:239
-#, fuzzy
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Kies Uw Server"
+msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Server type:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Manuele Server"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -1745,9 +1745,8 @@ msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Commando: /users"
+msgstr "Commando's"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1755,7 +1754,7 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Limieten"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1767,7 +1766,7 @@ msgstr "Limiteer max lijnen in chat"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1778,9 +1777,8 @@ msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Bericht"
+msgstr "Berichten"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1791,36 +1789,40 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
-msgid "Log magic messages in debug tab"
+msgid "Put all whispers in tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "Tijd"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Gebruik lokale tijd"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1869,19 +1871,14 @@ msgstr "Blauw:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Wijzig"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1926,311 +1923,368 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Automatisch enkel bereikbare monsters viseren"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Markeer het aanvalsbereik van de monsters"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Toon hp statusbalk van monsters"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "Markeer het aanvalsbereik van de speler"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "Toon uitgebreide minimaps"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
-msgstr ""
+msgstr "Bewegen"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
-msgstr ""
+msgstr "Aanvallen tijdens verplaatsen"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
-#, fuzzy
+#: src/gui/setup_other.cpp:103
 msgid "Player"
-msgstr "Spelers"
+msgstr "Speler"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
-msgstr ""
+msgstr "Toon hp statusbalk van jezelf"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Zet snelle statistieken aan"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
-#, fuzzy
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
-msgstr "Zet handle tab aan"
+msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Accepteer koop/verkoop aanvragen"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
-msgstr ""
+msgstr "shop modus aanzetten"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
+msgstr "Toon achtergrond"
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relatie"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutraal"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Vriend"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Hw acceleratie"
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Genegeerd"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Handelen toestaan"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Fluisteren toestaan"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Toon geslacht"
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Tijdens negeren:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Toon geslacht"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Toon niveau"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
-msgstr ""
+msgstr "Viseer dode spelers"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Zichtbare namen"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Zichtbare namen"
-
-#: src/gui/setup_players.cpp:341
-#, fuzzy
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
-msgstr "Toon Voorwerpen"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relatie"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutraal"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Vriend"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Geen rekening mee houden"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Gewist"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Handelen toestaan"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Fluisteren toestaan"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Oud"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "Relaties"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Tijdens negeren:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
-msgstr ""
+msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
-msgstr ""
+msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
-msgstr ""
+msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
-msgstr ""
+msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
-msgstr ""
+msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2282,137 +2336,120 @@ msgstr "gemiddeld"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Hw acceleratie"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Zet muziek aan"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS limiet: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2435,13 +2472,14 @@ msgstr "Toevoegen"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 msgid "Announce"
-msgstr ""
+msgstr "Aankondigingen"
 
 #: src/gui/shopwindow.cpp:125
 msgid "Show links in announce"
-msgstr ""
+msgstr "Toon links in aankondigingen"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
@@ -2476,14 +2514,14 @@ msgstr ""
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
 msgid "Lvl: %d"
-msgstr ""
+msgstr "Niv: %d"
 
 #: src/gui/skilldialog.cpp:537
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr ""
+msgstr "Niv: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
@@ -2515,7 +2553,7 @@ msgstr "Verlaten Guild?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groep"
 
@@ -2536,24 +2574,24 @@ msgstr ""
 #: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
-msgstr ""
+msgstr "Verlaten Groep?"
 
 #: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
-msgstr ""
+msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:799
 msgid "Atk"
-msgstr ""
+msgstr "Aanv"
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
@@ -2573,11 +2611,11 @@ msgstr "Guild aanmaken"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr ""
+msgstr "Groep aanmaken"
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr ""
+msgstr "Sociaal"
 
 #: src/gui/socialwindow.cpp:1034
 msgid "Invite"
@@ -2586,44 +2624,44 @@ msgstr "Nodig uit"
 #: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor groep %s aanvaard."
 
 #: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor groep %s geweigerd."
 
 #: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor guild %s aanvaard."
 
 #: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor guild %s geweigerd."
 
 #: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Maken van guild %s."
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Maken van groep %s."
 
 #: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr ""
+msgstr "Guild Naam"
 
 #: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr ""
+msgstr "Kies uw guild naam"
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -2632,7 +2670,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Guild Uitnodiging Aanvaarden"
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
@@ -2640,12 +2678,12 @@ msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2663,7 +2701,7 @@ msgstr "Groepsuitnodiging aanvaarden"
 
 #: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
@@ -2677,504 +2715,504 @@ msgstr "Kies uw groepsnaam."
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) standaard bewegingen"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) geïnverteerde bewegingen"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) dubbel normaal + raar"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
-msgstr ""
+msgstr "(?) beweeg"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) manuele vreemde beweging"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) vreemde beweging"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) beweeg tot aan doel"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) standaard volgen"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) relatief volgen"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) gespiegeld volgen"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) huisdier volgen"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) onbekend volgen"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) standaard aanval"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) wissel aanval zonder schild"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) wissel aanval met schild"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) aanval"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) ga en val aan"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) ga, val aan, raap op"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) zonder auto aanval"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) klein raap op 1x1 velden"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) raap op 3x3 velden"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) go en raap op met bereik 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) ga en raap op met bereik 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?) raap op"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) normale map tonen"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) debug map tonen"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ultra map tonen"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ultra map tonen 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) lege map tonen"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) zwart & witte map tonen"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
-msgstr ""
+msgstr "(?) map tonen"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) magie aanval"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) standaard imitatie"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) kleren imitatie"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
-msgstr ""
+msgstr "(?) imitatie"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) op toetsenbord"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
-msgstr ""
+msgstr "(A) weg"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
-msgstr ""
+msgstr "(?) weg"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) spel camera modus"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) vrije camera modus"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
-msgstr ""
+msgstr "(D) design camera modus"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Niveau: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
-msgstr ""
+msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr ""
+msgstr "Geen Doel"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr ""
+msgstr "Doel Toestaan"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr ""
+msgstr "Heeft Doel Nodig"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr ""
+msgstr "Algemene Magie"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr ""
+msgstr "Levensmagie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "Oorlogsmagie"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Wijzigingsmagie"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "Natuursmagie"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr ""
+msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
-msgstr ""
+msgstr "ander"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
-msgstr ""
+msgstr "Symbool:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr ""
+msgstr "Commando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr ""
+msgstr "Doel Type:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
-msgstr ""
+msgstr "Icoon:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr ""
+msgstr "Magie niveau:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
-msgstr ""
+msgstr "Magie School:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr ""
+msgstr "School niveau:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
-msgstr ""
+msgstr "Bewaren"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
@@ -3199,7 +3237,7 @@ msgstr "Handel: Jij"
 #: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "U krijgt %s"
 
 #: src/gui/tradewindow.cpp:111
 msgid "You give:"
@@ -3209,48 +3247,48 @@ msgstr "Je geeft:"
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Je hebt niet genoeg geld."
+
+#: src/gui/tradewindow.cpp:453
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Je hebt niet genoeg geld."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3260,19 +3298,19 @@ msgstr "Wezen"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Namen van vrienden"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Namen van geen belang"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Genegeerde Namen"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Verwijderde Namen"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3380,15 +3418,15 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik van speler"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Aanvalsbereikrand van speler"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik van monster"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3402,25 +3440,25 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
-msgstr ""
+msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Wie Is Online - Bijgewerkt"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
@@ -3485,6 +3523,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
@@ -3524,15 +3563,19 @@ msgstr "Globale aankondiging van %s:"
 #: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s fluistert: %s"
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Wijzig"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Negeer de andere speler"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Stop met de andere speler te negeren"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
@@ -3548,11 +3591,13 @@ msgstr "Dit commando sluit de huidige fluistertab."
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Commando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Dit commando negeert de andere speler niettegenstaande enige huidige "
+"relaties."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3561,22 +3606,23 @@ msgstr "Commando: /unignore <speler>"
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr ""
+msgstr "BC"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Bot controle"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Wie is online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
@@ -3588,7 +3634,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
-msgstr ""
+msgstr "STA"
 
 #: src/gui/windowmenu.cpp:73
 msgid "Status"
@@ -3604,7 +3650,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:81
 msgid "SKI"
-msgstr ""
+msgstr "VAAR"
 
 #: src/gui/windowmenu.cpp:88
 msgid "SPE"
@@ -3612,7 +3658,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:93
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
@@ -3632,19 +3678,19 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "WU"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Weet u"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "OPT"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr ""
+msgstr "Selecteer Wereld"
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
@@ -3652,13 +3698,13 @@ msgstr "Wijzig Login"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "Kies Wereld"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -3684,11 +3730,11 @@ msgstr "Viseren en Aanvallen"
 
 #: src/keyboardconfig.cpp:51
 msgid "Move to Target"
-msgstr ""
+msgstr "Beweeg tot aan Doel"
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Wijzig Bewegen tot aan Doel type"
 
 #: src/keyboardconfig.cpp:55
 msgid "Move to Home location"
@@ -3712,7 +3758,7 @@ msgstr "Aanval stoppen"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target Closest"
-msgstr ""
+msgstr "Dichtsbijzijnde viseren"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3748,7 +3794,7 @@ msgstr "Handelen inschakelen/uitschakelen"
 
 #: src/keyboardconfig.cpp:78
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Wijzig Map Tonen Modus"
 
 #: src/keyboardconfig.cpp:80
 msgid "Item Shortcuts Key"
@@ -3811,7 +3857,7 @@ msgstr "Debugvenster"
 
 #: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr ""
+msgstr "Sociaal Venster"
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
@@ -3819,7 +3865,7 @@ msgstr "Emoticonsnelkoppelingsvenster"
 
 #: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr ""
+msgstr "Kleren Venster"
 
 #: src/keyboardconfig.cpp:148
 msgid "Shop Window"
@@ -3835,19 +3881,19 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:154
 msgid "Commands Window"
-msgstr ""
+msgstr "Commando Venster"
 
 #: src/keyboardconfig.cpp:156
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "Bot Controle Venster"
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Wie Is Online Venster"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Weet u Venster"
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -3917,9 +3963,8 @@ msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Volgende chattab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -3987,15 +4032,15 @@ msgstr "Wissel Snel Neerleggingsteller"
 
 #: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Snel jezelf of iemand anders genezen"
 
 #: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Gebruik #itenplz spreuk"
 
 #: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
-msgstr ""
+msgstr "Gebruik magie aanval"
 
 #: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
@@ -4052,86 +4097,86 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
-msgstr ""
+msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "U raapte op %d [@@%d|%s@@]."
+msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
-msgstr ""
+msgstr "Weg"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
-msgstr ""
+msgstr "Volg: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
-msgstr ""
+msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
-msgstr ""
+msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "manaplus [opties] [mana-bestand]"
 
 #: src/main.cpp:48
 msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+msgstr "[mana-bestand]: Het mana bestand is een XML bestand (.mana)"
 
 #: src/main.cpp:49
 msgid "              used to set custom parameters"
-msgstr ""
+msgstr "              om manuele parameters te gebruiken"
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
-msgstr ""
+msgstr "              aan de manaplus client."
 
 #: src/main.cpp:52
 msgid "Options:"
@@ -4139,75 +4184,75 @@ msgstr "Opties:"
 
 #: src/main.cpp:53
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "  -l --log-file       : Log bestand te gebruiken"
 
 #: src/main.cpp:54
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
 #: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "  -v --version        : Toon de versie"
 
 #: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr ""
+msgstr "  -h --help           : Toon deze help"
 
 #: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
 #: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
-msgstr ""
+msgstr "  -U --username       : Login met deze gebruikersnaam"
 
 #: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
-msgstr ""
+msgstr "  -P --password       : Loging met dit wachtwoord"
 
 #: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
-msgstr ""
+msgstr "  -c --character      : Login met dit karakter"
 
 #: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
+msgstr "  -s --server         : Login servernaam of IP"
 
 #: src/main.cpp:62
 msgid "  -p --port           : Login server port"
-msgstr ""
+msgstr "  -p --port           : Login serverpoort"
 
 #: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : Updateserver te gebruiken"
 
 #: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
 #: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skip-update    : update downloads overslaan"
 
 #: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data           : Map om spelgegevens te laden"
 
 #: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
-msgstr ""
+msgstr "     --safemode       : Start spel in veilige modus"
 
 #: src/main.cpp:74
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4221,83 +4266,509 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Kracht"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Sterkte:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agiliteit:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitaliteit:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Intelligentie:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Dexteriteit:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Geluk:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Onbekende char-server fout."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Verkeerde naam."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Ongeldige statistieken."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Ongeldig haar."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Personage verwijderd."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Kon personage niet verwijderen."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Kanalen worden niet ondersteund!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Behendigheid"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
+msgstr "Online gebruikers: %d"
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Spel"
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Aanvraag op de stoppen is geweigerd!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commando: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Vaardigheid"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commando: /leave"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Geeft deze help weer."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guild aangemaakt."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitaliteit"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligentie"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Nodig een speler uit voor jouw groep"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Verlaat de groep waarin je je bevindt"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Commando: /item <beleid>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
+"\", \"false\"."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Commando: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Commando: /exp <beleid>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
+"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
+"\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
+"\"false\", \"no\"."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Commando: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Voorwerpdeling ingeschakeld."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Voorwerpdeling uitgeschakeld."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Voorwerpdeling is niet mogelijk."
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Voorwerpdeling onbekend."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Ervaringsdeling ingeschakeld."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Ervaringsdeling uitgeschakeld."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Ervaringsdeling is niet mogelijk."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Kan voorwerp niet gebruiken."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Kan dit niet uitrusten."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Oud wachtwoord is ongeldig."
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Nieuw wachtwoord is te kort."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Verkeerd wachtwoord."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Geweigered door de server."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Client is te oud."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Deze gebruikersnaam is al genomen."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Gebruikersnaam is compleet verwijderd"
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Kan geen groep aanmaken."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Groep succesvol aangemaakt."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s is al een lid van een groep."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s wees jouw uitnodiging af."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s is nu een lid van jouw groep."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Je hebt de groep verlaten."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s heeft jouw groep verlaten."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Een onbekend lid probeerde te zeggen: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Je bent dood."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "We betreuren het om je te melden dat jouw personage is gestorven in een "
 "gevecht."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Je bent niet langer levend."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Werp een muntstuk in om verder te spelen."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4305,7 +4776,7 @@ msgstr ""
 "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
 "naar een beter plaats gegaan."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4313,43 +4784,321 @@ msgstr ""
 "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
 "te slaan is mislukt."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Dit verliep niet zoals gepland."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Verslagen"
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
-msgstr ""
+msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Je bent niet langer."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Je hebt opgehouden te zijn."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Je bent stokstijf."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Beroofd van het leven, rust je in vrede."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Jouw metabolische processen behoren nu tot het verleden."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Je bent een ex-speler."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Bericht"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Handel mislukte!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Emoticon gefaald!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Zitten niet mogelijk!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Chatcreatie mislukte!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Kan je niet bij de groep voegen!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Kan niet roepen!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Je hebt nog geen hoog genoeg level bereikt!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Onvoldoende leven!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Onvoldoende Vaardigheidspunten!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Je hebt geen memo's!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Je kan dat nu niet doen!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Je hebt een andere rode edelsteen nodig!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Je hebt een andere blauwe edelsteen nodig!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Je draagt teveel bij je om dit te doen!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Huh? Wat is dat?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Warp mislukt..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Kon niets stelen..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Gif had geen effect..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handelen is niet mogelijk. Partner is te ver weg."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handelen is niet mogelijk. Personage bestaat niet."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel onderbroken vanwege een onbekende reden."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handelen: Jij en %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel met %s geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel voltooid."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Kracht"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Kracht %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Behendigheid"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Behendigheid %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Handigheid"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Handigheid %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitaliteit"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitality %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligentie"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligentie %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Wilskracht"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Wilskracht %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Klik OK om opnieuw te verschijnen."
 
 #: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr ""
+msgstr "Je bent gestorven"
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr ""
+msgstr "Niet ingelogd"
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
@@ -4357,31 +5106,31 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "Ongeldige naam."
 
 #: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr ""
+msgstr "Naam van personage bestaat al."
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Ongeldige haarstijl."
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Ongeldige haarkleur."
 
 #: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "Ongeldig geslacht."
 
 #: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr ""
+msgstr "Statistieken van personage zijn te hoog."
 
 #: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr ""
+msgstr "Statistieken van personage zijn te laag."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -4392,19 +5141,9 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr ""
+msgstr "Speler verwijderd."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
@@ -4413,7 +5152,7 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "Onbekende fout (%d)."
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -4427,51 +5166,47 @@ msgstr "Onderwerp: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "Spelers in dit kanaal:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "Fout bij binnenkomen ruimte."
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "Lijst van ruimtes."
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr ""
+msgstr "Einde van lijst van ruimtes."
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%s is de ruimte binnengekomen."
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s verliet de ruimte."
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s heeft modus %s gezet op gebruiker %s."
 
 #: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s heeft %s eruit geschopt."
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guild aangemaakt."
+msgstr "Onbekend ruimte gebeurtenis."
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr "Fout bij het creëren van guild."
+msgstr "Fout bij aanmaken guild."
 
 #: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
@@ -4487,11 +5222,11 @@ msgstr "Kon lid niet promoveren."
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr ""
+msgstr "Verkeerd magic_token."
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr ""
+msgstr "Je bent al ingelogd."
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
@@ -4499,11 +5234,7 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
+msgstr "Nieuw wachtwoord is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
@@ -4511,28 +5242,29 @@ msgstr "Account niet verbonden. Log eerst in aub."
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "Nieuw email adres is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "Oud email adres is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "Het nieuwe email adres bestaat reeds."
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"Client registratie is niet toegestaan. Contacteer aub de server adminstratie."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr ""
+msgstr "Client versie is te oud."
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "Verkeerde gebruikersnaam of wachtwoord."
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
@@ -4544,15 +5276,15 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr ""
+msgstr "Verkeerde gebruikersnaam, wachtwoord of email adres."
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr ""
+msgstr "Gebruikersnaam bestaat al."
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr ""
+msgstr "Email adres bestaat al."
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -4570,7 +5302,7 @@ msgstr "%s heeft zich bij de groep gevoegd."
 #: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
-msgstr ""
+msgstr "%s heeft uw uitnodiging geweigerd."
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -4580,24 +5312,11 @@ msgstr "Inkomende handelsaanvragen accepteren."
 msgid "Ignoring incoming trade requests."
 msgstr "Inkomende handelsaanvragen negeren."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Handelen met %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel voltooid."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Kick gefaald!"
@@ -4616,7 +5335,7 @@ msgstr "Kan niets verkopen."
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Kan niets verkopen terwijl je aan het handelen bent."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
@@ -4654,31 +5373,31 @@ msgstr "Geluk %+d"
 
 #: src/net/tmwa/generalhandler.cpp:140
 msgid "Authentication failed."
-msgstr ""
+msgstr "Authenticatie gefaald."
 
 #: src/net/tmwa/generalhandler.cpp:143
 msgid "No servers available."
-msgstr ""
+msgstr "Geen servers beschikbaar."
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #: src/net/tmwa/generalhandler.cpp:150
 msgid "This account is already logged in."
-msgstr ""
+msgstr "Deze account is al ingelogd."
 
 #: src/net/tmwa/generalhandler.cpp:153
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Snelheidshack gedetecteerd."
 
 #: src/net/tmwa/generalhandler.cpp:156
 msgid "Duplicated login."
-msgstr ""
+msgstr "Verdubbelde login."
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Unknown connection error."
-msgstr ""
+msgstr "Onbekende connectiefout."
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -4690,25 +5409,25 @@ msgstr "Geluk"
 
 #: src/net/tmwa/generalhandler.cpp:267
 msgid "Defense"
-msgstr ""
+msgstr "Verdediging"
 
 #: src/net/tmwa/generalhandler.cpp:268
 msgid "M.Attack"
-msgstr ""
+msgstr "M.Aanval"
 
 #: src/net/tmwa/generalhandler.cpp:269
 msgid "M.Defense"
-msgstr ""
+msgstr "M.Verdediging"
 
 #: src/net/tmwa/generalhandler.cpp:271
 #, no-c-format
 msgid "% Accuracy"
-msgstr ""
+msgstr "% Nauwkeurigheid"
 
 #: src/net/tmwa/generalhandler.cpp:273
 #, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% Ontwijking"
 
 #: src/net/tmwa/generalhandler.cpp:275
 #, no-c-format
@@ -4717,27 +5436,27 @@ msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:276
 msgid "Attack Delay"
-msgstr ""
+msgstr "Aanvalsvertraging"
 
 #: src/net/tmwa/generalhandler.cpp:278
 msgid "Walk Delay"
-msgstr ""
+msgstr "Wandelvertraging"
 
 #: src/net/tmwa/generalhandler.cpp:280
 msgid "Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik"
 
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Leeg adres gegeven aan Network::connect()!"
 
 #: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Niet mogelijk te resolven van host \""
 
 #: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "Verbinding met server beëindigd. "
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
@@ -4746,19 +5465,19 @@ msgstr "%s is niet in jouw groep!"
 
 #: src/playerrelations.cpp:414
 msgid "Print '...'"
-msgstr ""
+msgstr "Say '...'"
 
 #: src/playerrelations.cpp:434
 msgid "Blink name"
-msgstr ""
+msgstr "Blink naam"
 
 #: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Zwevende '...' bel"
 
 #: src/playerrelations.cpp:481
 msgid "Floating bubble"
-msgstr ""
+msgstr "Zwevende bel"
 
 #: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84
@@ -4788,291 +5507,3 @@ msgstr "Magie %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personage verwijderd."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Kon personage niet verwijderen."
-
-#~ msgid "Strength:"
-#~ msgstr "Sterkte:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agiliteit:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitaliteit:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligentie:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Dexteriteit:"
-
-#~ msgid "Luck:"
-#~ msgstr "Geluk:"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanalen worden niet ondersteund!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Geeft deze help weer."
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Commando: /invite <nick>"
-
-#~ msgid "Command: /leave"
-#~ msgstr "Commando: /leave"
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Nodig een speler uit voor jouw groep"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Verlaat de groep waarin je je bevindt"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Commando: /item <beleid>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-#~ "\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", "
-#~ "\"no\", \"false\"."
-
-#~ msgid "Command: /item"
-#~ msgstr "Commando: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Commando: /exp <beleid>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
-#~ "\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
-#~ "\"false\", \"no\"."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Commando: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Voorwerpdeling ingeschakeld."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Voorwerpdeling uitgeschakeld."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Voorwerpdeling is niet mogelijk."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Voorwerpdeling onbekend."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Ervaringsdeling ingeschakeld."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Ervaringsdeling uitgeschakeld."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Ervaringsdeling is niet mogelijk."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Kan voorwerp niet gebruiken."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Kan dit niet uitrusten."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Je bent tijdelijk geband van het spel tot %s.\n"
-#~ "Neem aub contact op met het GM team via de forums."
-
-#~ msgid "Could not create party."
-#~ msgstr "Kan geen groep aanmaken."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Groep succesvol aangemaakt."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s is al een lid van een groep."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s wees jouw uitnodiging af."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s is nu een lid van jouw groep."
-
-#~ msgid "You have left the party."
-#~ msgstr "Je hebt de groep verlaten."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s heeft jouw groep verlaten."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Een onbekend lid probeerde te zeggen: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Werp een muntstuk in om verder te spelen."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
-
-#~ msgid "You are no more."
-#~ msgstr "Je bent niet langer."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Je hebt opgehouden te zijn."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Je bent stokstijf."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Beroofd van het leven, rust je in vrede."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Jouw metabolische processen behoren nu tot het verleden."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Je bent een ex-speler."
-
-#~ msgid "Message"
-#~ msgstr "Bericht"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
-#~ "herstellen."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Handel mislukte!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Emoticon gefaald!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Zitten niet mogelijk!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Chatcreatie mislukte!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Kan je niet bij de groep voegen!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Kan niet roepen!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Je hebt nog geen hoog genoeg level bereikt!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Onvoldoende leven!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Onvoldoende Vaardigheidspunten!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Je hebt geen memo's!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Je kan dat nu niet doen!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Je hebt een andere rode edelsteen nodig!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Je hebt een andere blauwe edelsteen nodig!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Je draagt teveel bij je om dit te doen!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Huh? Wat is dat?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Warp mislukt..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Kon niets stelen..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Gif had geen effect..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Handelen is niet mogelijk. Partner is te ver weg."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Handelen is niet mogelijk. Personage bestaat niet."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Handel onderbroken vanwege een onbekende reden."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Handelen: Jij en %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Handel met %s geannuleerd."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr ""
-#~ "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
diff --git a/po/pl.po b/po/pl.po
index a23f98caf..8402fc357 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,131 +1,126 @@
-# Polish translation of The Mana World.
-# Copyright (C) 2007 The Mana World Development Team
-# This file is distributed under the same license as the The Mana World package.
-# Mateusz Jedrasik <m.jedrasik@gmail.com>, 2007.
-# Zuzanna K. Filutowska <platyna@platinum.linux.pl>, 2007.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: The Mana World 0.1.0\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2009-09-14 06:59+0000\n"
-"Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
-"Language-Team: <pl@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"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"
 
-#: src/actorspritemanager.cpp:1030
-#, fuzzy
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr "Widoczne imiona"
+msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:900
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Łączenie z serwerem map..."
+msgstr ""
 
-#: src/client.cpp:931
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Użytkownik"
+msgstr ""
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1056
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Wybierz postać"
+msgstr ""
 
-#: src/client.cpp:1087
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "Łączenie z serwerem map..."
+msgstr ""
 
-#: src/client.cpp:1097
-#, fuzzy
+#: src/client.cpp:1113
 msgid "Changing game servers"
-msgstr "Serwer"
+msgstr ""
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1177
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Hasło:"
+msgstr ""
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1197
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Zmień"
+msgstr ""
 
-#: src/client.cpp:1198
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "Członek został pomyślnie wypromowany."
+msgstr ""
 
-#: src/client.cpp:1218
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Wyrejestruj"
+msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1612
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Nieprawidłowy host aktualizacji: "
+msgstr ""
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -141,8 +136,8 @@ msgstr "Nie można wysłać pustych szeptów!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
 "ty."
@@ -152,14 +147,13 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
 #: src/commandhandler.cpp:456
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Brakuje nazwy grupy."
+msgstr ""
 
 #: src/commandhandler.cpp:469 src/commandhandler.cpp:576
 #: src/commandhandler.cpp:617 src/commandhandler.cpp:647
@@ -183,34 +177,31 @@ msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
 #: src/commandhandler.cpp:555
-#, fuzzy
 msgid "friend"
-msgstr "Przyjaciel"
+msgstr ""
 
 #: src/commandhandler.cpp:560
-#, fuzzy
 msgid "disregarded"
-msgstr "Nielubiany"
+msgstr ""
 
 #: src/commandhandler.cpp:565
-#, fuzzy
 msgid "neutral"
-msgstr "Neutralny"
+msgstr ""
 
 #: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
 #: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Pomyślnie utworzono grupę."
+msgstr ""
 
 #: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
 #: src/commandhandler.cpp:628
 msgid "Player wasn't ignored!"
@@ -221,24 +212,20 @@ msgid "Player no longer ignored!"
 msgstr ""
 
 #: src/commandhandler.cpp:637
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
 #: src/commandhandler.cpp:654
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
 #: src/commandhandler.cpp:665
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Pomyślnie utworzono grupę."
+msgstr ""
 
 #: src/commandhandler.cpp:667
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
 #: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
@@ -286,24 +273,20 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "font cache size"
-msgstr "Rozmiar czcionki"
+msgstr ""
 
 #: src/commandhandler.cpp:1094
-#, fuzzy
 msgid "Cache size:"
-msgstr "Rozmiar czcionki"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Utwórz"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Usuń"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -318,108 +301,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
-#, fuzzy
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Zrzut ekranu zapisany do ~/"
+msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:511
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
+msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1425
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Nie można załadować mapy"
+msgstr ""
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
 
-#: src/gui/beingpopup.cpp:108
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Grupa (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:122
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:132
+#, c-format
 msgid "Guild: %s"
-msgstr "Gildie"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:146
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:156
+#, c-format
 msgid "Comment: %s"
-msgstr "Komenda: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Okno Emotek"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atak"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
-msgstr "Przesuń w górę"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Resetuj"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Kup"
 
@@ -448,7 +425,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -459,31 +436,31 @@ msgid "Max"
 msgstr "Maks."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sprzedaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -499,24 +476,22 @@ msgid "Account: %s"
 msgstr "Konto: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Nowy Adres Email już istnieje"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -529,23 +504,22 @@ msgid "Password:"
 msgstr "Hasło:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Wpisz dwukrotnie nowe hasło:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Hasło musi mieć conajmniej %d znaków."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Hasło nie może mieć więcej jak %d znaków."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -575,14 +549,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Kolor włosów:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Fryzura:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -641,82 +613,71 @@ msgid "Unregister"
 msgstr "Wyrejestruj"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Zmień adres Email"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Nieprawidłowe hasło"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Usunięcie gracza nie powiodło się."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Nieprawidłowe hasło"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Usuń"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Zamknij"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Poziom: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Domyślny"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Przyjaciel"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Zielony: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Niebieski: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "niskie"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Hiperłącze"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -727,30 +688,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Rzucana"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Tęcza"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Tęcza"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Tęcza"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -758,12 +715,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:589
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d graczy jest obecnych."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -777,61 +734,53 @@ msgid "No"
 msgstr "Nie"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
-#, fuzzy
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
-msgstr "Ignorowany"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Mapa"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Przesuń w lewo"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Następna"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Temat: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Imię: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "MiniMapa"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Własny kursor"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Gracz uderza Potwora"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Efekty Cząsteczkowe"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -863,51 +812,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Efekty Cząsteczkowe"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Przesuń w lewo"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Namierz Gracza"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Namierz Gracza"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Namierz Gracza"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Namierz Gracza"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Atak %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "MiniMapa"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -916,9 +858,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Uderzenie Krytyczne"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -940,28 +881,25 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zamknij"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Poprzednia"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Następna"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "Ok"
 
@@ -969,10 +907,10 @@ msgstr "Ok"
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -980,83 +918,80 @@ msgstr "Zdejmij"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "Miejsc:"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-#, fuzzy
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:121
-#, fuzzy
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
-msgstr "mana"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Upuść"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upuść"
@@ -1094,71 +1029,67 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Nieznany błąd"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Waga: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Okno statusu"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Resetuj"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Resetuj"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Poziom: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Cena: %s/ Razem: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1166,7 +1097,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1174,29 +1105,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1205,9 +1136,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Zamknij"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1227,9 +1157,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Zapamiętaj użytkownika"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1240,9 +1169,8 @@ msgid "Register"
 msgstr "Rejestruj"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Serwer"
+msgstr ""
 
 #: src/gui/ministatus.cpp:59
 msgid "health bar"
@@ -1261,27 +1189,24 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:92
-#, fuzzy
 msgid "weight bar"
-msgstr "Waga: "
+msgstr ""
 
 #: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:98
-#, fuzzy
 msgid "money bar"
-msgstr "Potwór uderza Gracza"
+msgstr ""
 
 #: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:104
-#, fuzzy
 msgid "status bar"
-msgstr "Stan"
+msgstr ""
 
 #: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
@@ -1300,18 +1225,17 @@ msgid "Submit"
 msgstr "Zatwierdź"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
-msgstr "Kij"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Następna"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1331,364 +1255,329 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Pieniądze: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Zdejmij"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
-msgstr "Szept"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
-#, fuzzy
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
-msgstr "Przyjaciel"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
-#, fuzzy
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
-msgstr "Nielubiany"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
-#, fuzzy
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
-msgstr "Ignorowany"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Kompletnie ignoruj %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
-#, fuzzy
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
-msgstr "niskie"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
-#, fuzzy
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
-msgstr "Zmień adres Email"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
-msgstr "/party > Zaproś użytkownika do grupy"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
-#, fuzzy
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
-msgstr "@@admin-kick|Wykop gracza@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
-#, fuzzy
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
-msgstr "@@admin-kick|Wykop gracza@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
-#, fuzzy
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
-msgstr "Zmień"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
-#, fuzzy
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
-msgstr "/party > Zaproś użytkownika do grupy"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
-#, fuzzy
 msgid "Kick player"
-msgstr "Wykopanie nie powiodło się!"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
-msgstr "Pokaż imię"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
-#, fuzzy
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
-msgstr "@@attack|Atakuj %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:296
-#, fuzzy
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
-msgstr "@@attack|Atakuj %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:299
-#, fuzzy
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
-#, fuzzy
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
-msgstr "@@chat|Dodaj do czatu@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:461
-#, fuzzy
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
-msgstr "Podnieś"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
-#, fuzzy
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
-msgstr "@@chat|Dodaj do czatu@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
-msgstr "Zapamiętaj użytkownika"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
-#, fuzzy
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
-msgstr "Zapamiętaj użytkownika"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
-#, fuzzy
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
-msgstr "Podświetlenie zakładki"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:545
-#, fuzzy
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
-msgstr "Podświetlenie zakładki"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
-msgstr "Zapamiętaj użytkownika"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
-msgstr "Nie można kupić."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
-msgstr "Włącz/Wysłącz Handlowanie"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Duża"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:715
-#, fuzzy
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
-msgstr "Zmień"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
-#, fuzzy
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
-msgstr "@@chat|Dodaj do czatu@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
-#, fuzzy
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
-msgstr "@@chat|Dodaj do czatu@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
-#, fuzzy
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
-#, fuzzy
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
-#, fuzzy
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1567
-#, fuzzy
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1569
-#, fuzzy
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
-msgstr "Przechowaj"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
-msgstr "Upuść"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
-msgstr "Pobierz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1611
-#, fuzzy
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
-msgstr "Pobierz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
-#, fuzzy
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
-msgstr "Pobierz"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
-#, fuzzy
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
-msgstr "@@chat|Dodaj do czatu@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Domyślny"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
-#, fuzzy
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
-msgstr "Przesuń w górę"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
-#, fuzzy
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
-msgstr "Przesuń w dół"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
@@ -1735,14 +1624,12 @@ msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
 #: src/gui/serverdialog.cpp:228
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Wybierz twój serwer"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Wybierz twój serwer"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1753,23 +1640,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Server type:"
-msgstr "Serwer:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:287
-#, fuzzy
 msgid "Connect"
-msgstr "Łączenie..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:288
-#, fuzzy
 msgid "Custom Server"
-msgstr "Własny kursor"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
@@ -1781,9 +1665,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:556
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Oczekiwanie na serwer"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
@@ -1815,14 +1698,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Włącz joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Włącz joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1841,9 +1722,8 @@ msgid "Music volume"
 msgstr "Głośność muzyki"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Brak tekstu"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1853,67 +1733,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Kolory"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-#, fuzzy
-msgid "Enable trade tab"
-msgstr "Nie można kupić."
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Umieść wszystkie szepty w zakładkach"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Nie można kupić."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:91
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Pokaż imię"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:94
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Następna zakładka czatu"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1921,14 +1829,9 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Kolory"
-
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Typ: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1950,39 +1853,34 @@ msgid "Spectrum"
 msgstr "Widmo"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Opóźnienie: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Czerwony: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Zielony: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Niebieski: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -2019,9 +1917,8 @@ msgid "Assign"
 msgstr "Przypisz"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Przypisz"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2035,487 +1932,515 @@ msgstr "Wykryto konflikt klawiszy."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Potwory"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Nie można kupić."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Podświetlenie"
+msgid "Show monster hp bar"
+msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-#, fuzzy
-msgid "Highlight floor items"
-msgstr "Podświetlenie"
-
 #: src/gui/setup_other.cpp:67
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Włącz joystick"
+msgid "Show warps particles"
+msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-#, fuzzy
-msgid "Show warps particles"
-msgstr "jako cząsteczkę"
+msgid "Highlight floor items"
+msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Pokaż imię"
+msgid "Moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
-#, fuzzy
-msgid "Show own hp bar"
-msgstr "Pokaż imię"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Włącz joystick"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-#, fuzzy
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
-msgstr "Wiadomość"
+msgstr ""
 
-#: src/gui/setup_other.cpp:114
-#, fuzzy
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr "Nie można kupić."
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
 
-#: src/gui/setup_other.cpp:117
-#, fuzzy
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr "Włącz/Wysłącz Handlowanie"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
-#, fuzzy
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
-msgstr "Nie można kupić."
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Gracze"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Widoczne imiona"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relacja"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Przyjaciel"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Nielubiany"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorowany"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Umieść wszystkie szepty w zakładkach"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Pokaż imię"
-
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Gracze"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_players.cpp:313
-#, fuzzy
-msgid "Show level"
-msgstr "Pokaż imię"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:317
-#, fuzzy
-msgid "Show own name"
-msgstr "Pokaż imię"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:321
-#, fuzzy
-msgid "Target dead players"
-msgstr "Namierz Gracza"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:325
-#, fuzzy
-msgid "Secure trades"
-msgstr "Akceptuj handel"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-#, fuzzy
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
-msgstr "Efekty Cząsteczkowe"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-#, fuzzy
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr "Pomoc"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
-msgstr "Akceptuj handel"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:241
-#, fuzzy
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Rozmiar czcionki"
+
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr "Zmień"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Drobna"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Mała"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Średnia"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Duża"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-#, fuzzy
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:224
-#, fuzzy
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Brak tekstu"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bąbelki, brak imion"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bąbelki z imionami"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "średnie"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:328
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Relacja"
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Widoczne imiona"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Pokaż powiadomienie o podniesieniu"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "w czacie"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Włącz joystick"
-
-#: src/gui/setup_video.cpp:353
-#, fuzzy
-msgid "Show background"
-msgstr "Tło"
-
-#: src/gui/setup_video.cpp:358
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "Limit FPS:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
-#, fuzzy
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr "Limit FPS:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekst nad głową"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
-#: src/gui/setup_video.cpp:380
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Detale cząsteczek"
-
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Rozmiar czcionki"
+msgstr ""
 
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nie"
+msgstr ""
 
-#: src/gui/setup_video.cpp:583
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:589
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:600
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Przełączanie na pełen ekran"
+msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:613
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Zmień na OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Zmieniono rozdzielczość ekranu"
+msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Zmieniono ustawienia ef. cząsteczek"
+msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
@@ -2532,7 +2457,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Dodaj"
 
@@ -2544,15 +2469,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Prośba o Handel"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s chce handlować z tobą, zgadzasz się?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2563,31 +2488,31 @@ msgid "Up"
 msgstr "Góra"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Punkty umiejętności: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Punkty umiejętności: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Zdolności"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Poziom: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Poziom: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gildia"
 
@@ -2597,9 +2522,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Gildia została utworzona."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2611,23 +2536,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Utwórz Gildię"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Czy na pewno chcesz wyjść?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupa"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Zaproś użytkownika do grupy"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2635,9 +2559,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Zaproś użytkownika do grupy"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2649,75 +2572,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Czy na pewno chcesz wyjść?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Atak"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Atak"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignorowany"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Utwórz Gildię"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Stwórz postać"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Zaproś Użytkownika"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Zaakceptowano zaproszenie od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Odrzucono zaproszenie od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Zaakceptowano zaproszenie od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Odrzucono zaproszenie od %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Błąd podczas tworzenia gildii."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2725,43 +2643,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Gildia"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Wybierz twój serwer"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Zaakceptuj zaproszenie do grupy"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2782,263 +2695,254 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Grupa"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Wybierz twój serwer"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Przesuń w lewo"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Przesuń w lewo"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Atak"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Zmień postać"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Zmień postać"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Zmień postać"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Klawiatura"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3076,19 +2980,19 @@ msgid "Job:"
 msgstr "Praca:"
 
 #: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Statystyki postaci w porządku."
+msgstr ""
 
 #: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Poziom: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Punkty umiejętności: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
 #: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
@@ -3217,99 +3121,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Przesuń w lewo"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Zezwól na handel"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Przesuń w lewo"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Ogólny"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Komenda: /przedmiot"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magia"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Komenda: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Namierz Gracza"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Maks. poziom"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Pokaż imię"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3333,26 +3225,27 @@ msgstr "Zaakceptowano. Oczekiwanie..."
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "Otrzymujesz %s"
+msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
@@ -3373,22 +3266,21 @@ msgstr "Łączenie..."
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 spróbował później"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -3397,24 +3289,20 @@ msgid "Being"
 msgstr "Byty"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Przyjaciel"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Nielubiany"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignorowany"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "Imiona GM"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3432,28 +3320,21 @@ msgstr "Imiona GM"
 msgid "NPCs"
 msgstr "NPC"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Potwory"
-
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Potwór uderza Gracza"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Grupa"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Gildia"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3468,76 +3349,64 @@ msgid "Exp Notification"
 msgstr "Powiadomienie o Exp"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Potwór uderza Gracza"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Gracz uderza Potwora"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Potwór uderza Gracza"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Imiona Innych Graczy"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Uderzenie Krytyczne"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Gracz uderza Potwora"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Gracz uderza Potwora"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
-#, fuzzy
 msgid "Local Player Miss"
-msgstr "Zapisz listę graczy"
+msgstr ""
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
 msgstr "Pudła"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Podświetlenie zakładki"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Podświetlenie"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Podświetlenie"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Podświetlenie"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Podświetlenie zakładki"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3548,9 +3417,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Potwór uderza Gracza"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3564,23 +3432,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3645,7 +3513,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
@@ -3679,9 +3547,9 @@ msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s szepcze: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3704,34 +3572,29 @@ msgid "This command closes the current whisper tab."
 msgstr "Komenda zamyka obecną zakładkę szeptania"
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Komenda: /przedmiot"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Komenda: /item <zasada>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
-"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Okno Emotek"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3746,9 +3609,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Emotikonka"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3783,9 +3645,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Skrót"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3808,23 +3669,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Wybrano OK"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Zmień"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Wybierz twój serwer"
+msgstr ""
 
 #: src/inventory.cpp:248
 msgid "Storage"
-msgstr "Magazyn"
+msgstr ""
 
 #: src/inventory.cpp:250
 msgid "Cart"
@@ -3851,9 +3709,8 @@ msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Przesuń w lewo"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3880,9 +3737,8 @@ msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Namierz najbliższy cel"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3917,14 +3773,12 @@ msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Zmień adres Email"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Skrót Przedmiotu %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -3936,7 +3790,7 @@ msgstr "Skrót Przedmiotu %d"
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Skrót Przedmiotu %d"
@@ -3982,43 +3836,36 @@ msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Okno Umiejętności"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Okno statusu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Okno Ustawień"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Ukryj Okna"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Okno statusu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Komenda: /przedmiot"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Okno Emotek"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4029,14 +3876,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Poprzednia zakładka czatu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Następna zakładka czatu"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4060,7 +3905,7 @@ msgstr "Następna zakładka czatu"
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
@@ -4097,219 +3942,206 @@ msgstr "Poprzednia zakładka czatu"
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr "Poprzednia zakładka czatu"
+msgstr ""
 
-#: src/keyboardconfig.cpp:279
-#, fuzzy
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr "Następna zakładka czatu"
+msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
-#, fuzzy
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr "Przesuń w dół"
+msgstr ""
 
-#: src/keyboardconfig.cpp:295
-#, fuzzy
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr "Przesuń w lewo"
+msgstr ""
 
-#: src/keyboardconfig.cpp:296
-#, fuzzy
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr "Przesuń w prawo"
+msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
-#, fuzzy
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr "Zmień postać"
+msgstr ""
 
-#: src/keyboardconfig.cpp:316
-#, fuzzy
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr "Serwer"
+msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
-#, fuzzy
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr "Namierz i Atakuj"
+msgstr ""
 
-#: src/keyboardconfig.cpp:322
-#, fuzzy
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr "Zmień hasło"
+msgstr ""
 
-#: src/keyboardconfig.cpp:324
-#, fuzzy
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr "Zmień adres Email"
+msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
-#, fuzzy
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr "Włącz/Wysłącz Handlowanie"
+msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Rozwiąż je, albo granie może być utrudnione."
+msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
-#, fuzzy
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
-msgstr "Nie można podnieść przedmiotu."
+msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
-#, fuzzy
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
-msgstr "Serwer jest pełny"
+msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
-#, fuzzy
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
-msgstr "Nie można podnieść przedmiotu."
+msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
-#, fuzzy, c-format
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
-msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
-#, fuzzy
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
-msgstr " anulował"
+msgstr ""
 
-#: src/localplayer.cpp:3455
-#, fuzzy
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
-msgstr "Zmień adres Email"
+msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
-#, fuzzy
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
-msgstr " anulował"
+msgstr ""
 
-#: src/localplayer.cpp:3817
-#, fuzzy
+#: src/localplayer.cpp:3849
 msgid "You see "
-msgstr "Otrzymujesz %s"
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4332,93 +4164,76 @@ msgid "Options:"
 msgstr "Opcje:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Pokazuje wersję"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Pokazuje tę pomoc"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Zaloguj z tym hasłem"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Zaloguj z tą postacią"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Nazwa serwera logowania, lub IP"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Port serwera logowania"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Katalog, z którego załadować dane gry"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4432,2146 +4247,1228 @@ msgstr "Dziękuję za kupno."
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Siła"
-
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Siła %+d"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Zwinność"
-
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Zwinność %+d"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Zręczność"
-
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Zręczność %+d"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Witalność"
-
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Witalność %+d"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Inteligencja"
-
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencja %+d"
-
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Siła woli:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Siła woli %+d"
-
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Jesteś martwy."
-
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Już nie jesteś taki żywy."
-
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
-
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Koniec gry!"
-
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
-"do lepszego miejsca."
-
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
-"zawiódł."
-
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
-
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Czy chesz zidentyfikować twoje rzeczy?"
-
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Niestety, ślad po tobie zaginął..."
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Unicestwiony."
-
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Wygląda na to, że podano tobie twoją głowę."
-
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
-
-#: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Naciśnij OK, aby się odrodzić"
-
-#: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
-msgid "You Died"
-msgstr "Umarłeś"
-
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
-msgid "Not logged in."
-msgstr "Już zalogowany"
-
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nazwa użytkownika już istnieje"
-
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Statystyki postaci w porządku."
-
-#: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Statystyki postaci w porządku."
-
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nieznany błąd"
-
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Info"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
-msgid "Player deleted."
-msgstr "Gracz usunięty"
-
-#: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Wybierz ilość przedmiotów do handlu."
-
-#: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Nieznany błąd"
-
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "Brak dostępnych serwerów gier"
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Temat: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Gracz uderza Potwora"
-
-#: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Komenda: /join <kanał>"
-
-#: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
-msgid "Listing channels."
-msgstr "Prośba o dołączenie do kanału %s."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s dołączył do grupy."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Nieznane polecenie."
-
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "Gildia została utworzona."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Błąd podczas tworzenia gildii."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Zaproszenie wysłane."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Członek został pomyślnie wypromowany."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Promocja Członka nie powiodła się."
-
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Zły magic_token"
-
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
-msgid "Already logged in."
-msgstr "Już zalogowany"
-
-#: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
-msgid "Account banned."
-msgstr "Konto wygasło"
-
-#: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Nowe hasło jest nieprawidłowe"
-
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Stare hasło jest nieprawidłowe"
-
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
-msgstr "Konto niepołączone. Proszę najpierw się zalogować."
-
-#: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Nowy adres email jest niepoprawny"
-
-#: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Stary adres email jest niepoprawny"
-
-#: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Nowy Adres Email już istnieje"
-
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Wersja klienta jest zbyt stara"
-
-#: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Zła nazwa użytkownika lub hasło"
-
-#: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
-msgid "Account banned"
-msgstr "Konto wygasło"
-
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Zła nazwa użytkownika, hasło, lub adres email"
-
-#: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nazwa użytkownika już istnieje"
-
-#: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
-msgid "Email address already exists."
-msgstr "Adres email już istnieje"
-
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Dołączono do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s dołączył do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s odmówił zaproszenia."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Akceptowanie nadchodzących próśb o handel."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorowanie nadchodzących próśb o handel."
-
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s chce handlować z tobą, zgadzasz się?"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handel z %s"
-
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Handel anulowany."
-
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Handel zakończony."
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Wykopanie nie powiodło się!"
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Wykopanie powiodło się!"
-
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Dziękuję za sprzedaż."
-
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Nie można sprzedać."
-
-#: src/net/tmwa/buysellhandler.cpp:138
-#, fuzzy
-msgid "Unable to sell while trading."
-msgstr "Nie można sprzedać."
-
-#: src/net/tmwa/buysellhandler.cpp:141
-#, fuzzy
-msgid "Unable to sell unsellable item."
-msgstr "Nie można podnieść przedmiotu."
-
-#: src/net/tmwa/charserverhandler.cpp:121
+#: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
-msgstr "Nie można uzyć tego ID"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr "Nieznany błąd"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
-"Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr "Zły magic_token"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr "Usunięto postać."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr "Usunięcie gracza nie powiodło się."
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Siła:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Zwinność:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Witalność:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Inteligencja:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Zręczność:"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Szczęście:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:128
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:136
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Gracz"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-#, fuzzy
+#: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr "Gracz"
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "Kanały nie są wspierane!"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Nazwa"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr "Prośba o Handel"
-
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Siła %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
-#, c-format
-msgid "Agility %+d"
-msgstr "Zwinność %+d"
-
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Vitality %+d"
-msgstr "Witalność %+d"
-
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligencja %+d"
-
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Zręczność %+d"
-
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Szczęście %+d"
-
-#: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Uwierzytelnienie nie powiodło się"
-
-#: src/net/tmwa/generalhandler.cpp:141
-#, fuzzy
-msgid "No servers available."
-msgstr "Brak dostępnych serwerów"
-
-#: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Ktoś inny próbuje użyć tego konta"
-
-#: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "To konto jest już zalogowane"
-
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Wykryto Speed hack"
-
-#: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
-msgid "Duplicated login."
-msgstr "Zduplikowany login"
-
-#: src/net/tmwa/generalhandler.cpp:157
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Nieznany błąd połączenia"
-
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "Rozłączono z serwerem!"
-
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Szczęście"
-
-#: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
-msgid "Defense"
-msgstr "Obrona:"
-
-#: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
-msgid "M.Attack"
-msgstr "Atak M.:"
-
-#: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
-msgid "M.Defense"
-msgstr "Obrona M.:"
-
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy, no-c-format
-msgid "% Accuracy"
-msgstr "% Celność:"
-
-#: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
-msgid "% Evade"
-msgstr "% Unik:"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
-msgid "% Critical"
-msgstr "Uderzenie Krytyczne"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-#, fuzzy
-msgid "Attack Delay"
-msgstr "Atak %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
-msgid "Walk Delay"
-msgstr "Atak %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
-msgid "Attack Range"
-msgstr "Potwór uderza Gracza"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Wyświetla tą pomoc"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Zaproszenie gracza do twojej grupy"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Opuszenie grupy, w której jesteś"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Komenda: /invite <ksywka>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Komenda: /leave"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Komenda powoduje opuszczenie grupy przez gracza"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Gildia została utworzona."
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Błąd podczas tworzenia gildii."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
+#: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
 msgid "Guild name: %s"
-msgstr "Gildia"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
 msgid "Guild master: %s"
-msgstr "Gildia"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
 msgid "Guild level: %d"
-msgstr "Poziom: %d"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
 msgid "Average level: %d"
-msgstr "Maks. poziom"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Gildia"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "Gildia została utworzona."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
 msgid "Guild castle: %s"
-msgstr "Gildia została utworzona."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s jest od teraz członkiem twojej grupy."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr "Opuściłeś grupę."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s opuścił twoją grupę."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
+#: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s jest od teraz członkiem twojej grupy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Zaproszenie gracza do twojej grupy"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > Opuszenie grupy, w której jesteś"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "Komenda powoduje opuszczenie grupy przez gracza"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "Komenda: /item <zasada>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
-"przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "Komenda: /przedmiot"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "Komenda: /exp <zadada>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
-"doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
-"doświadczenia."
 
-#: src/net/tmwa/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "Komenda: /exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "Podział przedmiotu włączony."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "Podział przedmiotu wyłączony."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "Podział przedmiotu nie jest możliwy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:157
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Podział przedmiotu włączony."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "Podział doświadczenia włączony."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "Podział doświadczenia wyłączony."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "Podział doświadczenia nie jest możliwy."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:196
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "Podział doświadczenia włączony."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "Użycie przedmiotu nie powiodło się."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "Nie można założyć."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:93
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "Nowe hasło jest za krótkie"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Niezarejestrowany ID"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Nieprawidłowe hasło"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "Konto wygasło"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Odrzucony z serwera"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:180
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Wersja klienta jest zbyt stara"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Zostałeś tymczasowo zbanowany z gry do dnia %s.\n"
-"Proszę skontaktować się z zespołem GM poprzez forum."
 
-#: src/net/tmwa/loginhandler.cpp:190
+#: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr "Ta nazwa użytkownika jest już zajęta"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr "Nazwa użytkownika już istnieje"
-
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Nie można sprzedać."
-
-#: src/net/tmwa/network.cpp:426
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Łączenie z serwerem map..."
-
-#: src/net/tmwa/partyhandler.cpp:86
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "Nie można utworzyć grupy."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "Pomyślnie utworzono grupę."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s opuścił twoją grupę."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s już jest członkiem grupy."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s odmówił zaproszenia."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s jest od teraz członkiem twojej grupy."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "Opuściłeś grupę."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s opuścił twoją grupę."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "Nieznany członek próbował powiedzieć: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s nie jest w twojej grupie!"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "Jesteś martwy."
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "Już nie jesteś taki żywy."
+
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr "Koniec gry!"
+
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "Wrzuć monetę aby kontynuować."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
+"do lepszego miejsca."
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
+"zawiódł."
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr "Czy chesz zidentyfikować twoje rzeczy?"
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Niestety, ślad po tobie zaginął..."
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Unicestwiony."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr "Wygląda na to, że podano tobie twoją głowę."
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
+
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "Więcej ciebie nie ma."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "Przestałeś istnieć."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "Jesteś sztywniakiem."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "Twoje procesy metaboliczne są teraz historią."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "Kopnąłeś w kalendarz."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "Jesteś ex-graczem."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "Usychasz z tęsknoty za fiordami."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "Wiadomość"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:353
-#, fuzzy
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "Podniosłeś "
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
 msgid "You spent %s."
-msgstr "Otrzymujesz %s"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
-msgstr "Najpierw załóż strzały."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Handel zakończony niepowodzeniem!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Emotka nieudana!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Siad nieudany!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Utworzenie czatu nieudane!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Nie można dołączyć do grupy!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:173
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Nie można krzyknąć!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Masz za niski poziom!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Niewystarczające HP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Niewystarczające SP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "Nie masz notatek!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "Nie możesz teraz tego zrobić!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Nie można użyć tej umiejętności z taką bronią!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Potrzebujesz innego czerwonego kamienia!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:212
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Potrzebujesz innego niebieskiego kamienia!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:215
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Jesteś zbyt obciążony aby to zrobić!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "O! Co to?"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Nie mogę nic ukraść..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Trucizna nie zadziałała..."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s chce handlować z tobą, zgadzasz się?"
+
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel anulowany z nieznanego powodu."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Handel: Ty i %s"
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Handel z %s został anulowany."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "Nieobsługiwany pakiet anulowania handlu."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
-"Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
-"rodzaj przedmiotu w okienku."
 
-#: src/net/tmwa/tradehandler.cpp:264
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
-
-#: src/playerrelations.cpp:414
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:434
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:478
-msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
-msgid "Floating bubble"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel anulowany."
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
-#: src/resources/monsterdb.cpp:84
-msgid "unnamed"
-msgstr "nienazwany"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel zakończony."
 
-#: src/resources/itemdb.cpp:62
-#, c-format
-msgid "Attack %+d"
-msgstr "Atak %+d"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Siła"
 
-#: src/resources/itemdb.cpp:63
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "Defense %+d"
-msgstr "Obrona %+d"
+msgid "Strength %+.1f"
+msgstr ""
 
-#: src/resources/itemdb.cpp:64
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Zwinność"
 
-#: src/resources/itemdb.cpp:65
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:168
-msgid "Unknown item"
-msgstr "Nieznany przedmiot"
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Poziom: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Przesuń w lewo"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Statystyki postaci w porządku."
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Emotikonka"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Handel z %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Atakuj %s@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Użyj@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Anuluj@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Pobierz@@"
-
-#, fuzzy
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Lekceważ %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignoruj %s@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Użyj@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Przestań Ignorować %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Kompletnie ignoruj %s@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Zaproś użytkownika do grupy"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Wykop gracza@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|Przestań Ignorować %s@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Użyj@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|Atakuj %s@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Wykop gracza@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Dodaj imię do czatu@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Anuluj@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Podnieś %s@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Dodaj do czatu@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Użyj@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Wybrano OK"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Pomoc --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Pokazuje tę pomoc"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Wyświetla nazwę mapy"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Powiedz coś o sobie"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Czyści to okno"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Alias  polecenia msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Alias polecenia msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr ""
-#~ "/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Alias polecenia query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Zamyka zakładkę szeptania"
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Lekceważ %s@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Pokaż wszystkie publiczne kanały"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Dołącz lub utwórz kanał"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Utworzenie nowej grupy"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Utworzenie nowej grupy"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Zaproś użytkownika do grupy"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, "
-#~ "jeżeli zapisywanie jest włączone)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Globalne ogłoszenie (tylko GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Zamyka zakładkę szeptania"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
-
-#~ msgid "Command: /help"
-#~ msgstr "Komenda: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Ta komenda wyświetla listę dostępnych komend."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Komenda: /help <komenda>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Komenda: /announce <wiadomość>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** dostępne tylko dla GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Komenda: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Ta komenda czyści zawartość okna."
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Komenda: /item <zasada>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Ta komenda wyświetla liczbę połączonych graczy."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Komenda: /join <kanał>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Ta komenda pokazuje listę wszystkich kanałów."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Komenda: /me <wiadomość>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Komenda: /msg <ksywka> <wiadomość>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Komenda: /whisper <ksywka> <wiadomość>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Komenda: /w <ksywka> <wiadomość>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Komenda: /query <ksywka>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Komenda: /q <ksywka>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy "
-#~ "tobą i <ksywka>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Komenda: /w <ksywka> <wiadomość>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Komenda: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Ta komenda ustawia temat na <wiadomość>."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Komenda: /create <nazwa-grupy>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Komenda: /create <nazwa-grupy>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Komenda: /party <ksywka>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Komenda: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
-#~ "zapisu, lub dziennika czatu."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Komenda: /toggle <stan>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, "
-#~ "lub czy dziennik zapisu powinien się automatycznie wyłączyć."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić "
-#~ "przełącznik, lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Komenda: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Ta komenda wyświetla status przełącznika"
-
-#~ msgid "Command: /where"
-#~ msgstr "Komenda: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-
-#~ msgid "Command: /who"
-#~ msgstr "Komenda: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Ta komenda wyświetla liczbę połączonych graczy."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Wpisz /help aby usyskać listę komend."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Detale cząsteczek"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Efekty otoczenia"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Skrót Emotki %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Gracz uderza Potwora"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Temat: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Imię: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "MiniMapa"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Komenda: /record <nazwa_pliku>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
-
-#~ msgid "Command: /record"
-#~ msgstr "Komenda: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Ta komenda kończy zapisywanie sesji"
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Dozór wpisany do dziennika zapisu"
-
-#~ msgid "Finishing recording."
-#~ msgstr "Zakończono zapisywanie."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Obecnie nie zapisuje."
-
-#~ msgid "Already recording."
-#~ msgstr "Już zapisuje."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Rozpoczęcie zapisywania..."
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Rozpoczęcie zapisywania nie powiodło się."
-
-#~ msgid "Recording..."
-#~ msgstr "Zapisywanie..."
-
-#~ msgid "Stop recording"
-#~ msgstr "Zatrzymaj zapisywanie"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Znajdź Ścieżkę do Myszy"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Pieniądze: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Praca:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Poziom: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Pomyślnie utworzono grupę."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
-
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
-
-#~ msgid "Sound"
-#~ msgstr "Dźwięk"
-
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Dostęp zabroniony"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Nieznany błąd podczas wyboru postaci"
-
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
-
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s zaprosił ciebie, byś dołączył do grupy."
-
-#~ msgid "Willpower:"
-#~ msgstr "Siła woli:"
-
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Handel z %s"
-
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Szept"
-
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Zaprzyjaźnij się z %s@@"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Nielubiany"
+msgid "Agility %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Kompletnie ignoruj %s@@"
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Zręczność"
 
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Zaproś %s do grupy@@"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Witalność"
 
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Rozmawiaj z %s@@"
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Wykop potwora@@"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligencja"
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Podnieś"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Nie można wysłać pustego czatu!"
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
 
-#~ msgid "Unable to unequip."
-#~ msgstr "Nie można zdjąć."
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
 
-#~ msgid "Text Shadow"
-#~ msgstr "Cień tekstu"
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
 
-#~ msgid "Text Outline"
-#~ msgstr "Kontur Tekstu"
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Etykiety Pasków Postępu"
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Przedmiot zbyt drogi"
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Przedmiot jest założony"
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
 
-#~ msgid "Player"
-#~ msgstr "Gracz"
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
 
-#~ msgid "Is"
-#~ msgstr "Jest"
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
 
-#~ msgid "Server"
-#~ msgstr "Serwer"
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Nieznany Typ Przedmiotu"
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
 
-#~ msgid "Generics"
-#~ msgstr "Ogólne"
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#~ msgid "Hats"
-#~ msgstr "Kapelusze"
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#~ msgid "Usables"
-#~ msgstr "Użytkowe"
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#~ msgid "Shirts"
-#~ msgstr "Koszulki"
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Bronie jednoręczne"
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
 
-#~ msgid "Pants"
-#~ msgstr "Spodnie"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Brak dostępnych serwerów gier"
 
-#~ msgid "Shoes"
-#~ msgstr "Buty"
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr "Temat: %s"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Bronie jednoręczne"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
 
-#~ msgid "Shields"
-#~ msgstr "Tarcze"
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
 
-#~ msgid "Rings"
-#~ msgstr "Pierścienie"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#~ msgid "Necklaces"
-#~ msgstr "Naszyjniki"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#~ msgid "Arms"
-#~ msgstr "Naramienniki"
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
 
-#~ msgid "Ammo"
-#~ msgstr "Amunicja"
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#~ msgid "HP Bar"
-#~ msgstr "Pasek HP"
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Paska HP"
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Paska HP"
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Paska HP"
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Błąd podczas tworzenia gildii."
 
-#~ msgid "no"
-#~ msgstr "nie"
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Zaproszenie wysłane."
 
-#~ msgid "Buddy"
-#~ msgstr "Znajomy"
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr "Członek został pomyślnie wypromowany."
 
-#~ msgid "Buddy List"
-#~ msgstr "Lista znajomych"
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr "Promocja Członka nie powiodła się."
 
-#~ msgid "Description: %s"
-#~ msgstr "Opis: %s"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Efekt: %s"
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Nowa"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Poziom Pracy: %d"
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#~ msgid "Present: "
-#~ msgstr "Obecny: "
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Konto niepołączone. Proszę najpierw się zalogować."
 
-#~ msgid "Quit Guild"
-#~ msgstr "Opuść Gildię"
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
 
-#~ msgid "Recent:"
-#~ msgstr "Ostatni:"
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Test Rzucania Zaklęcia 1"
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Test Rzucania Zaklęcia 2"
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Test Rzucania Zaklęcia 3"
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Bronie dwuręczne"
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Zdejmij@@"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Załóż@@"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Upuść@@"
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Rozdziel@@"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Zachowaj@@"
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#~ msgid "Select Server"
-#~ msgstr "Wybierz serwer"
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr "Dołączono do grupy."
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Nie udało się przełączyć na "
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s dołączył do grupy."
 
-#~ msgid "windowed"
-#~ msgstr "w oknie"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
 
-#~ msgid "fullscreen"
-#~ msgstr "pełny ekran"
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Akceptowanie nadchodzących próśb o handel."
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Tajemnicza umiejętność"
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorowanie nadchodzących próśb o handel."
 
-#~ msgid "Weapons"
-#~ msgstr "Bronie"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Handel z %s"
 
-#~ msgid "Crafts"
-#~ msgstr "Rzemiosła"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Wykopanie nie powiodło się!"
 
-#~ msgid "Stats"
-#~ msgstr "Statystyki"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Wykopanie powiodło się!"
 
-#~ msgid "Total"
-#~ msgstr "Razem"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Dziękuję za sprzedaż."
 
-#~ msgid "Cost"
-#~ msgstr "Koszt"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Nie można sprzedać."
 
-#~ msgid "Attack:"
-#~ msgstr "Atak:"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Refleks:"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Pozostało Punktów Statusu: %d"
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Siła %+d"
 
-#~ msgid "curl error "
-#~ msgstr "błąd curl "
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Zwinność %+d"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Witalność %+d"
 
-#~ msgid "Buddys"
-#~ msgstr "Znajomi"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligencja %+d"
 
-#~ msgid "Party Window"
-#~ msgstr "Okno Grupy"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Zręczność %+d"
 
-#~ msgid "Unarmed"
-#~ msgstr "Nieuzbrojony"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Szczęście %+d"
 
-#~ msgid "Knife"
-#~ msgstr "Nóż"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Miecz"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Laska"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Bat"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Łuk"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Shooting"
-#~ msgstr "Strzelectwo"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Mace"
-#~ msgstr "Maczuga"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Axe"
-#~ msgstr "Topór"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "Rozłączono z serwerem!"
 
-#~ msgid "Craft"
-#~ msgstr "Rrzemiosło"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Szczęście"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Nieznana Umiejętność"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "Nie można ustawić "
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid " video mode: "
-#~ msgstr " tryb wideo: "
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Łączenie z serwerem postaci..."
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Łączenie z serwerem kont..."
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias create"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Komenda: /new <nazwa-grupy>"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Unnamed"
-#~ msgstr "Nienazwany"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Podnieś %s@@"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Scroll radius"
-#~ msgstr "Skok przy przewijaniu ekranu"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Opóźnienie przy przewijaniu ekranu"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Nie można załadować selection.png"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s nie jest w twojej grupie!"
 
-#~ msgid "Emote"
-#~ msgstr "Emoty"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "NPC Text Request"
-#~ msgstr "Tekst NPC - Prośba"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "NPC Number Request"
-#~ msgstr "Prośba NPC Numer"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Anuluj\n"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "nienazwany"
 
-#~ msgid "inc"
-#~ msgstr "podw."
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Atak %+d"
 
-#~ msgid "use"
-#~ msgstr "użyj"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Obrona %+d"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Nieznany przedmiot"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default    : Pomiń proces logowania z domyślnymi ustawieniami"
 
-#~ msgid "Slots: "
-#~ msgstr "Miejsc: "
diff --git a/po/pt.po b/po/pt.po
index cc6685284..513dc8b00 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <freya.df@gmail.com>, 2011.
 # freya <freya.df@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,119 +9,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, 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."
@@ -134,265 +136,266 @@ msgstr "Comando desconhecido."
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -406,7 +409,7 @@ msgstr "Preço: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -414,30 +417,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -446,19 +449,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -624,9 +627,9 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Excluir"
 
@@ -700,10 +703,10 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -711,12 +714,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -729,15 +732,15 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -878,7 +881,7 @@ msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
@@ -894,19 +897,19 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -915,7 +918,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -944,31 +947,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -977,17 +980,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1037,91 +1040,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d faltando: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, avg mob para 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para próximo nível por %d min: %s"
 msgstr[1] "Tempo para próximo nível por %d mins: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próximo JackO:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível:  %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "JackOvai aparecer"
 
@@ -1141,7 +1144,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1166,43 +1169,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Trocar servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barra de Vida"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barra de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barra de experiencia "
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barra de Job"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barra de Peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Precisa"
 
@@ -1219,11 +1222,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1261,327 +1264,328 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Curar:"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser Amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Deixar pelado"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostar itens:"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Deixar sem Roupas"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr "Urdidura"
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Carregar Antigas Roupas"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Carregar Antigos Feitiços"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Não remover nome"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Mover a baixo"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Salvar Estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -1617,64 +1621,64 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1785,34 +1789,38 @@ msgid "Tabs"
 msgstr "Abas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Deixar as mensagens privadas em abas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1863,19 +1871,14 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1920,308 +1923,368 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relação"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Performance"
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutro"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr "Melhor performance (Habilite para melhor performance)"
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Auto ajuste de performance"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desconsiderado"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia "
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleração por HW"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Apagado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)"
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir negociações"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar redução de mapa (Software)"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensagens particulares"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr "Melhor qualidade (Desative para melhor performace)"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Antigo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Deixar as mensagens privadas em abas"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr "Habilitar reordenar sprites"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar gênero"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr "Menos memória (Habilite para menos uso de memória)"
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr "Desabilitar cache avançado (Software)"
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr "Desabilitar cache (Software)"
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quando ignorar:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Ver status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Mostrar endereço de ip nas capturas de tela"
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutro"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Apagado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir negociações"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensagens particulares"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Antigo"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "Relações"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quando ignorar:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Font Jasponesa"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2273,138 +2336,118 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleração por HW"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar cache de opacidade"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar redução de mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2433,7 +2476,8 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
@@ -2475,7 +2519,7 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2507,7 +2551,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2669,502 +2713,502 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(4)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Salvar"
 
@@ -3201,48 +3245,47 @@ msgstr "Você dá:"
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:332
-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."
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
+#: src/gui/tradewindow.cpp:453
+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."
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3394,23 +3437,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3475,6 +3518,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3513,6 +3557,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
@@ -3546,8 +3594,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3643,11 +3690,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4042,68 +4089,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Você vê "
 
@@ -4215,81 +4262,506 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Força"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Força:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agilidade:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalidade:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Inteligência:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Sorte:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Não é possível usar este ID."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido do char-server."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Nome errado."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Stats incorretos."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Cabelo incorreto."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Slot incorreto."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informações"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Personagem deletado."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Falha ao deletar personagem."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Não há suporte para canais!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidade"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Jogador VIP."
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "Jogador VIP:  "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
+msgid "Online users: %d"
+msgstr "Jogadores online: %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Jogo"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Requisição de saída negada!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Você já está em uma guilda"
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "Falha ao checar Emperium"
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Resposta do servidor desconhecida."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Guild name: %s"
+msgstr "Nome Guilda: %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Mestre da guilda: %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
+msgid "Guild level: %d"
+msgstr "Nível Guilda: %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Membros Online: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
+msgid "Max members: %d"
+msgstr "Max Membros: %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Nível médio: %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
+msgid "Guild exp: %d"
+msgstr "Guilda exp: %d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Guilda prox. exp: %d"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Castelo Guilda : %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "Não foi possível convidar jogador para a guilda."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "O jogador rejeitou o convite."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "Usuário agora é um membro da sua guilda."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Sua guilda está cheia."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Resposta desconhecida de convite para guilda."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s saiu de sua Guilda."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Você foi expulso da Guilda."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s foi expulso da Guilda."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Convida um jogador para o seu grupo"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Sai do grupo em que você está"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa alguém do grupo em que você está"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+"/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando convida <nick> para o seu grupo."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Este comando faz com que o jogador saia do grupo."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <opção>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
+"de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Comando: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Este comando exibe a atual opção de compartilhamento de itens do grupo."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <policy>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
+"de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Comando: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Compartilhamento de itens habilitado."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Compartilhamento de itens desabilitado."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Não é possível compartilhar itens."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Compartilhamento de itens desconhecido."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Compartilhamento de experiência habilitado."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Compartilhamento de experiência desabilitado."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Não é possível compartilhar experiência."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Compartilhamento de experiência desconhecido."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Falha ao usar item."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Impossível equipar."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Conta não encontrada. Por favor, tente novamente."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta."
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Nova senha é muito curta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "ID não registrado."
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Senha incorreta."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "A conta expirou."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Rejeitado pelo servidor."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Você foi permanentemente banido do jogo. Por favor entre em contato com "
+"algum GM."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Cliente muito antigo."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Você banido do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Server lotado."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Este nome de usuário já está em uso."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Usuário deletado."
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Não foi possível criar o grupo."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo criado."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s se junto ao grupo"
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s já é membro de um grupo."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s recusou seu convite."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s agora é um membro do seu grupo."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s não pode se juntar ao gupo cheio."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ resposta de convite desconhecida por %s."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Você saiu do grupo."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s saiu do seu grupo."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Um membro desconhecido tentou dizer: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informar que seu personagem foi morto em combate."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "As mãos frias da morte estão levando sua alma."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Insira uma moeda para continuar."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4297,38 +4769,319 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te ofereceram sua própria cabeça."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Você não morreu ainda. Está apenas descansando."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Você não é mais."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Você deixou de ser."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Você expirou e foi encontrar seu criador."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Você é um cadáver."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Sem vida, você descansa em paz."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Seus processos metabólicos agora são história."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Você bateu as botas."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Você chutou o balde."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
+"coro invisível."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Você é um ex-jogador"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Você foi desta para melhor."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Você está carregando menos da metade de seu peso. Você vai recuperar-se "
+"novamente."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Você pegou %s."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Você gastou %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Impossível aumentar o atributo!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Equipe as flechas primeiro."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Falha na negociação!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Falha no emoticon!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Falha ao sentar!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Falha ao criar Chat!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Impossivel entrar no grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Impossivel gritar!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Você ainda não tem o nivel necessário!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "HP insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Você não tem nenhuma nota armazenada!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Você não pode fazer isso agora!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que você precisa de mais dinheiro... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Você precisa de outra gema vermelha!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Você precisa de outra jóia azul!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Você está com muita carga para fazer isso!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Hã? O que é isso?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Falha ao transportar..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Não foi possível roubar nada..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Veneno não surtiu efeito..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Negociação impossível. O parceiro de negócios está muito longe."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Negociação impossível. O personagem não existe."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Negociação cancelada devido a uma razão desconhecida."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Negociação: Você e %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação com %s cancelada."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Troca injusta pacote cancelado."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Falha ao adicionar item. Você não pode trocar este item."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Força %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelegência %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Força de Vontade"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Força de Vontade %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Clique em OK para repopular."
@@ -4382,16 +5135,6 @@ msgstr "O status está muito longe do permitido (%u - %u)"
 msgid "Invalid slot number."
 msgstr "Número de slot inválido."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informações"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personagem deletado."
@@ -4455,10 +5198,6 @@ msgstr "%s expulsou %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconhecido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilda criada."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erro ao criar Guilda."
@@ -4491,10 +5230,6 @@ msgstr "Conta banida."
 msgid "New password incorrect."
 msgstr "Nova senha incorreta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Conta não conectada. Por favor, efetue o login primeiro."
@@ -4572,24 +5307,11 @@ msgstr "Aceitando propostas de negócios."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorando propostas de negócios."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
@@ -4780,5 +5502,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 20477c255..f7a2bf6a1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <alasmirt@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -11,119 +11,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, 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."
@@ -136,265 +138,266 @@ msgstr "Comando desconhecido."
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -408,7 +411,7 @@ msgstr "Preço: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -416,30 +419,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -448,19 +451,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -626,9 +629,9 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Excluir"
 
@@ -702,10 +705,10 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -713,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -731,15 +734,15 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -880,7 +883,7 @@ msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
@@ -896,19 +899,19 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -917,7 +920,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -946,31 +949,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -979,17 +982,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1039,91 +1042,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Falta: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d ex, avg mob por 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para o próximo nível %d min: %s "
 msgstr[1] "Tempo para o próximo nível %d mins: %s "
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Ultim exp por morte:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próxima aparição do JackO:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
@@ -1143,7 +1146,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1168,43 +1171,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Trocar servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barra de Vida"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barra de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barra de experiencia "
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barra de Job"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barra de Peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Precisa"
 
@@ -1221,11 +1224,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1263,327 +1266,328 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Mensagem Privada:"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Nu"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostrar itens:"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Despir"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Add comentário"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr "Urdidura"
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Carregar velhas roupas"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Carregar velhos feitiços"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Não remover o nome"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Mover para baixo"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Salvar Estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -1619,64 +1623,64 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1787,34 +1791,38 @@ msgid "Tabs"
 msgstr "Abas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Deixar as mensagens privadas em abas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar tempo local"
 
@@ -1865,19 +1873,14 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1922,308 +1925,368 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relação"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Performance"
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutro"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr "Melhor peformance (habilitar para melhor peformance)"
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Auto ajustar performance"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desconsiderado"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleração por HW"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Apagado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)"
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir negociações"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar redução de mapa (Software)"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensagens particulares"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr "Melhor qualidade (desabilita para melhor performance)"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Antigo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Deixar as mensagens privadas em abas"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr "Habilitar reordenar sprites."
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar gênero"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr "Menos memória (habilite para usar menos memória)"
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr "Desabilitar cache avançado (Software)"
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr "Desabilitar cache (Software)"
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quando ignorar:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Mostrar status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Mostrar endereço de ip nas capturas de tela"
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutro"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Apagado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir negociações"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensagens particulares"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Antigo"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "Relações"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quando ignorar:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Font Japonesa"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2275,138 +2338,118 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleração por HW"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar cache de opacidade"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar a redução de mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2435,7 +2478,8 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
@@ -2477,7 +2521,7 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2509,7 +2553,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2671,502 +2715,502 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Salvar"
 
@@ -3203,48 +3247,47 @@ msgstr "Você dá:"
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:332
-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."
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
+#: src/gui/tradewindow.cpp:453
+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."
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3396,23 +3439,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3477,6 +3520,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3515,6 +3559,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
@@ -3548,8 +3596,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3645,11 +3692,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4044,68 +4091,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Você vê "
 
@@ -4217,81 +4264,506 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Força"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Força:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agilidade:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalidade:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Inteligência:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Sorte:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Não é possível usar este ID."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido do char-server."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Nome errado."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Stats incorretos."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Cabelo incorreto."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Slot incorreto."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informações"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Personagem deletado."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Falha ao deletar personagem."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Não há suporte para canais!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidade"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Jogador VIP."
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "Jogador VIP:  "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
+msgid "Online users: %d"
+msgstr "Jogadores online: %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Jogo"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Requisição de saída negada!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Você já está em uma Guilda"
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "Falha ao checar Emperium"
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Resposta do servidor desconhecida."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Guild name: %s"
+msgstr "Nome Guilda: %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Mestre da guilda: %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
+msgid "Guild level: %d"
+msgstr "Nível Guilda: %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Membros Online: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
+msgid "Max members: %d"
+msgstr "Max Membros: %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Nível médio: %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
+msgid "Guild exp: %d"
+msgstr "Guilda exp: %d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Guilda prox. exp: %d"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Castelo Guilda : %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "Não foi possível convidar jogador para a guilda."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "O jogador rejeitou o convite."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "Usuário agora é um membro da sua guilda."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Sua guilda está cheia."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Resposta desconhecida de convite para guilda."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s saiu de sua Guilda."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Você foi expulso da Guilda."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s foi expulso da Guilda."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Convida um jogador para o seu grupo"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Sai do grupo em que você está"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa alguém do grupo em que você está"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+"/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando convida <nick> para o seu grupo."
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Este comando faz com que o jogador saia do grupo."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <opção>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
+"de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Comando: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Este comando exibe a atual opção de compartilhamento de itens do grupo."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <policy>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
+"de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Comando: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Compartilhamento de itens habilitado."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Compartilhamento de itens desabilitado."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Não é possível compartilhar itens."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Compartilhamento de itens desconhecido."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Compartilhamento de experiência habilitado."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Compartilhamento de experiência desabilitado."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Não é possível compartilhar experiência."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Compartilhamento de experiência desconhecido."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Falha ao usar item."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Impossível equipar."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Conta não encontrada. Por favor, tente novamente."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta."
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Nova senha é muito curta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "ID não registrado."
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Senha incorreta."
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "A conta expirou."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Rejeitado pelo servidor."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Você foi permanentemente banido do jogo. Por favor entre em contato com "
+"algum GM."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Cliente muito antigo."
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Você banido do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Servidor lotado."
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Este nome de usuário já está em uso."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Usuário apagado permanentemente. "
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Não foi possível criar o grupo."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo criado."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s se juntou ao grupo"
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s já é membro de um grupo."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s recusou seu convite."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s agora é um membro do seu grupo."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s não pode se juntar ao grupo cheio."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ resposta de convite desconhecida por %s."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Você saiu do grupo."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s saiu do seu grupo."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Um membro desconhecido tentou dizer: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informar que seu personagem foi morto em combate."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "As mãos frias da morte estão levando sua alma."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Insira uma moeda para continuar."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4299,38 +4771,319 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te ofereceram sua própria cabeça."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Você não morreu ainda. Está apenas descansando."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Você não é mais."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Você deixou de ser."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Você expirou e foi encontrar seu criador."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Você é um cadáver."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Sem vida, você descansa em paz."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Seus processos metabólicos agora são história."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Você bateu as botas."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Você chutou o balde."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
+"coro invisível."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Você é um ex-jogador"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Você foi desta para melhor."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
+"novamente."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Você pegou %s."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Você gastou %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Impossível aumentar o atributo!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Equipe as flechas primeiro."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Falha na negociação!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Falha no emoticon!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Falha ao sentar!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Falha ao criar Chat!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Impossivel entrar no grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Impossivel gritar!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Você ainda não tem o nivel necessário!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "HP insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Você não tem nenhuma nota armazenada!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Você não pode fazer isso agora!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que você precisa de mais dinheiro... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Você precisa de outra gema vermelha!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Você precisa de outra jóia azul!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Você está com muita carga para fazer isso!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Hã? O que é isso?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Falha ao transportar..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Não foi possível roubar nada..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Veneno não surtiu efeito..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Negociação impossível. O parceiro de negócios está muito longe."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Negociação impossível. O personagem não existe."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Negociação cancelada devido a uma razão desconhecida."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Negociação: Você e %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação com %s cancelada."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Troca injusta pacote cancelado."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Falha ao adicionar item. Você não pode trocar este item."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Força %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelegência %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Força de Vontade"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Força de Vontade %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Clique em OK para repopular."
@@ -4384,16 +5137,6 @@ msgstr "Seu estatus está longe do permitido (%u - %u)"
 msgid "Invalid slot number."
 msgstr "Número de slot inválido."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informações"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personagem deletado."
@@ -4457,10 +5200,6 @@ msgstr "%s expulsou %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconhecido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilda criada."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erro ao criar Guilda."
@@ -4493,10 +5232,6 @@ msgstr "Conta banida."
 msgid "New password incorrect."
 msgstr "Nova senha incorreta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Conta não conectada. Por favor, efetue o login primeiro."
@@ -4574,24 +5309,11 @@ msgstr "Aceitando propostas de negócios."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorando propostas de negócios."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
@@ -4782,5 +5504,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-
diff --git a/po/ru.po b/po/ru.po
index 4a013b7c5..4011f51f9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <reslayer@mail.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -10,119 +10,122 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:31+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -135,106 +138,106 @@ msgstr "Неизвестная команда."
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок Вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок Вы сами."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -242,7 +245,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -250,7 +253,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -258,7 +261,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -266,7 +269,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -274,131 +277,133 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:475
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:483
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:523
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:537
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP ранг: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Окно детектора ботов"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Движение"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Результат"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Купить"
 
@@ -412,7 +417,7 @@ msgstr "Цена: %s / Всего: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -420,30 +425,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Выход"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -452,19 +457,19 @@ msgstr "Продать"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -630,9 +635,9 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Удалить"
 
@@ -706,10 +711,10 @@ msgid "rainbow 3"
 msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -717,12 +722,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -735,15 +740,15 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Карта"
 
@@ -884,7 +889,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Закрыть"
 
@@ -900,19 +905,19 @@ msgstr "Следующий >"
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Снять"
 
@@ -921,7 +926,7 @@ msgid "Help"
 msgstr "Помощь"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Инвентарь"
 
@@ -950,31 +955,31 @@ msgid "id"
 msgstr "ид"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -983,17 +988,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1043,55 +1048,55 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Окно статистики атак"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Сбросить стат."
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Сбросить таймер"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Уровень: %d на %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Опыт: %d/%d Осталось: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убийств: %s, опыта: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1099,7 +1104,7 @@ msgstr[0] "Опыт за %d мин.: %s"
 msgstr[1] "Опыт за %d мин.: %s"
 msgstr[2] "Опыт за %d мин.: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1107,29 +1112,29 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
 msgstr[1] "Время до следующего уровня в мин. %d: %s"
 msgstr[2] "Время до следующего уровня в мин. %d: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Опыт за последнее убийство:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Время до появления jacko:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Время до следующего уровня: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "jacko появляется"
 
@@ -1149,7 +1154,7 @@ msgstr "Пропустить"
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Сервер:"
@@ -1174,43 +1179,43 @@ msgstr "Регистрация"
 msgid "Change Server"
 msgstr "Сменить сервер"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "здоровье"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "мана"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "опыт"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "работа"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "вес"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "слоты интвентаря"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "деньги"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "стрелы"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "статус"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Нужно"
 
@@ -1227,11 +1232,11 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1269,327 +1274,328 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Подружиться"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Пренебречь"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Стереть"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Не игнорировать"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Следовать"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Имитировать"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Показать предметы"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Раздеть"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr "Прыгнуть"
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Загрузить старые наряды"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Загрузить старые заклинания"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Сохранить состояние"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -1625,64 +1631,64 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Тип:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -1793,34 +1799,38 @@ msgid "Tabs"
 msgstr "Страницы"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Личные сообщения во вкладках"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Время"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Использовать местное время"
 
@@ -1871,19 +1881,14 @@ msgstr "Синий:"
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
-msgid "Edit"
-msgstr "Изменить"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1928,308 +1933,373 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Монстры"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Рисовать путь"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Рисовать клавиши на карте"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Движения"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Синх. движение"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Другое"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Показать фон"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Отношение"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Производительность"
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Нейтральное"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr "Улучшение производительности (включите для большей производительности)"
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Друг"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Автоматически подстраивать производительность"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Пренебрегаемый"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Отображать прозрачность на персонажах и монстрах"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Игнорировано"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Аппаратное ускорение"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Стерт"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+"Включить кеш прозрачности (программный режим, может использовать много "
+"памяти)"
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Разрешить торговлю"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr "Включить оптимизацию карты (программный режим)"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Разрешить шептание"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr "Улучшение качества (выключите для лучшей производительности)"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Старые"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+"Включить исправление альфа канала (программный режим, может быть очень "
+"медленным)"
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Личные сообщения во вкладках"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr "Включить перестановку спрайтов"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Показать пол"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+"Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr "Выключить расширенное кеширование сущностей (программный режим)"
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr "Выключить кеширование сущностей (программный режим)"
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Когда игнорируется:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Показать пол"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Показать уровень"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Показать свое имя"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Видимые имена"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Небезопасные символы"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Видимые имена"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Показывать статусы"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Показывать ip адреса на снимках экрана"
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Отношение"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Нейтральное"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Друг"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Пренебрегаемый"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Игнорировано"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Стерт"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Разрешить торговлю"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Разрешить шептание"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Старые"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "Связи"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Когда игнорируется:"
+
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Большой (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Боьшой (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Огромный (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Японский шрифт"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2281,140 +2351,120 @@ msgstr "средне"
 msgid "max"
 msgstr "макс."
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Аппаратное ускорение"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "в чате"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "как частицу"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Включить кеш прозрачности"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Включить режим сжатия карты"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr "Автоматически подстраивать производительность"
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr "Отображать прозрачность на персонажах и монстрах"
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Текст над головами"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
@@ -2443,7 +2493,8 @@ msgstr "Анонс"
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
@@ -2485,7 +2536,7 @@ msgstr "Уровень: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Гильдия"
 
@@ -2517,7 +2568,7 @@ msgstr "Покинуть Гильдию?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Группа"
 
@@ -2679,502 +2730,502 @@ msgstr "Выберите имя будущей группы."
 msgid "Specials"
 msgstr "Особые"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) неизвестное движение"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) неизвестный режим карты"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) камера в режиме разработки"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "ОЖ:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Профессия:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Без цели"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Разрешить цель"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Необходима цель"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Общая Магия"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Магия Жизни"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Боевая Магия"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Магия Трансформации"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Магия Природы"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Астральная магия"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Редактор команд"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Магия"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Другое"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Символ:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Мана:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3211,49 +3262,48 @@ msgstr "Вы отдаете:"
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "У вас недостаточно денег"
+
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "У вас недостаточно денег"
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3405,23 +3455,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3486,6 +3536,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Эта Команда делает <пользователь> оператором канала."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
@@ -3524,6 +3575,10 @@ msgstr "Глобальное объявление от %s:"
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Изменить"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Игнорировать другого игрока"
@@ -3551,16 +3606,15 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -3655,11 +3709,11 @@ msgstr "Сменить логин"
 msgid "Choose World"
 msgstr "Выберите сервер"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Хранилище"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Телега"
 
@@ -4054,41 +4108,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4096,27 +4150,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4225,81 +4279,502 @@ msgstr "Спасибо за покупку!"
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Сила (str)"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Сила (str):"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Выносливость (agi):"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Живучесть (vit):"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Интеллект (int):"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Ловкость (dex):"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Удача (luk):"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+"В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Нельзя использовать данный ID."
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr "Неизвестная ошибка сервера персонажей."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "Некорректное имя."
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "Некорректные статы."
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "Некорректный тип волос."
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "Некорректный слот."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Сведения"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Персонаж удален"
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Невозможно удалить персонажа."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Каналы не поддерживаются!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Сила (str) %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Сообщение не может быть отправлено, %s оффлайн."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Выносливость (agi)"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Игрок MVP."
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "Игрок MVP: "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Выносливость (agi) %+.1f"
+msgid "Online users: %d"
+msgstr "Пользователей онлайн: %d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ловкость (dex)"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Игра"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr "Запрос на выход отклонен!"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Команда: /invite <игрок>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Эта команда приглашает <имя персонажа> к Вам в группу."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Команда: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Эта команда заставляет игрока покинуть гильдию."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Показать эту справку"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Пригласить игрока в Вашу гильдию"
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Покинуть текущую гильдию"
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Гильдия создана."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "Вы и так в гильдии"
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr "Имперская проверка провалена"
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "Неизвестный ответ сервера."
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Ловкость (dex) %+.1f"
+msgid "Guild name: %s"
+msgstr "Имя гильдии: %s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Живучесть (vit)"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "Мастер гильдии: %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Живучесть (vit) %+.1f"
+msgid "Guild level: %d"
+msgstr "Уровень гильдии: %d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Интеллект (int)"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "Пользователей онлайн: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Интеллект (int) %+.1f"
+msgid "Max members: %d"
+msgstr "Макс. членов: %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Воля"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "Средний уровень: %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Воля (wil) %+.1f"
+msgid "Guild exp: %d"
+msgstr "Опыт гильдии: %d"
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Нужно опыта до следующего уровня: %d"
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Замки: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "Не удалось пригласить пользователя в гиьдию."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr "Пользователь отклонил приглашение."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr "Пользователь теперь в Вашей гильдии."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Ваша гильдия полна."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr "Неизвестный ответ на приглашение в гильдию."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "Вы покинули гильдию."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s покинул Вашу гильдию."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "Вы были кикнуты из гильдии."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s был вышвырнут из Вашей гильдии."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Пригласить игрока в Вашу группу"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Покинуть текущую группу"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+"/item > Показать/Скрыть текущее состояние распределения предметов в группе"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "Эта команда заставляет игрока покинуть группу"
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Команда: /item <политика разделения предметов>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "Команда изменяет политику разделения предетов между ченами группы."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения или "
+"\"0\", \"no\", \"false\" -- для выключения."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Команда: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr "Отображает текущую политику разделения предметов между членами группы."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Команда: /exp <политика распределения опыта>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "Эта команда изменяет политику распределения опыта в группе."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<policy> может быть одним из \"1\", \"yes\", \"true\" - чтобы разрешить "
+"общий опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Команда: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Эта команда отображает текущую политику обмена опытом."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Обмен предметами включен"
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Обмен предметами выключен"
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Обмен предметами невозможен."
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "Статус обмена предметами неизвестен."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Обмен опытом вклыючен."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Обмен опытом выкючен."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Обмен опытом невозможен."
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "Политика распределения опыта неизвестна."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Не удалось использовать предмет."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Нельзя экипировать!"
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Учетная запись не найдена. Попробуйте снова."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Старый пароль указан неверно."
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Новый пароль слишком короткий."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "Незарегистрированный ID"
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Неверный пароль"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "Учетная запись просрочена."
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Получен отказ от сервера.."
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "Клиент устарел"
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr "Сервер переполнен"
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Это имя пользователя уже занято."
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr "Пользователь удален"
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Не удалось создать группу."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Группа успешно создана."
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s присоединился к группе."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s уже в Вашей группе."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s отверг Ваше приглашение."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s теперь в Вашей группе."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s не может присоединиться к Вашей группе, т.к. группа переполнена."
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ Неизвестный ответ на приглашение для %s"
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Вы покинули группу."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s покинул Вашу группу."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Неизвестный участник попытался сказать: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Вы мертвы."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "С грустью сообщаем вам, что Ваш персонаж пал в бою."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Вас больше нет среди живых."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Холодные руки Смерти извлекают Вашу душу."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Игра Окончена!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Опустите монетку для продолжения."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4307,37 +4782,318 @@ msgstr ""
 "Нет, детки. Ваш персонаж на самом деле не умер. Он...эммм...ушел в лучший "
 "мир."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Ваш план сломать оружие врагов о свое горло провалился."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Похоже, это было не слишком хорошо."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Хочешь, предскажу твою судьбу?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Грустно, Вас вряд ли когда-нибудь найдут..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Уничтожен."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Похоже, Вам отдали Вашу голову."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Вы опять пролетели, выбросите своё тело в трубу, и получите другое."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Вы не мертвы. Вы просто отдыхаете."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Вас больше нет."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Вы перестали быть."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Ваше время истекло, пора встретиться с Создателем."
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Вы сдулись."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Лишенный жизни, покойся с миром."
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Если бы Вы не были нарисованными, Вы бы отправлись на тот свет"
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Ваш обмен веществ стал историей."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Вы упали с ветки."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Вы протянули ноги."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Вы затаскали свою смертную оболочку, сорвали занавес и незримо "
+"присоединились к кровоточащему хору..."
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Вы не жилец."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Вас пришпиливают к фьордам."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Сообщение"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
+"восстанавливаться не будет."
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
+"восстанавливаться."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Вы получили %s."
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "Вы потратили %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Не удалось увеличить навык!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Для начала экипируйтесь стрелами!"
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Не удалось начать торговлю!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Не удалось использовать смайлик!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Не удалось присесть!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Не удалось создать чат!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Нельзя присоединиться к группе!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Нельзя кричать!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "У Вас недостаточный уровень!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Недостаточно ОЖ!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Недостаточно Маны"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "У Вас нет записей!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Вы не можете сделать это сейчас!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Похоже, Вам нужно боьше денег... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Вы не можете использовать это умение с этим видом оружия!"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "Вам нужен другой красный камень!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Вам нужен другой синий камень!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Вы несёте слишком много, чтобы сделать это!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "А? Что это?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Изменение не удалось..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Не удалось ничего украсть..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Яд не подействовал..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Торговля невозможна. Партнер по торговле слишком далеко."
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Торговля невозможна. Такой персонаж не существует."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Торговля отменена по неизвестной причине."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Торговля: Вы и %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Торговля с %s отменена."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Неизвестный сигнал завершения торговли."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Не удалось добавить предмет по неизвестной причине."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Торговля отменена."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Торговля завершена."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Сила (str)"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Сила (str) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Выносливость (agi)"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Выносливость (agi) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ловкость (dex)"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Ловкость (dex) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Живучесть (vit)"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Живучесть (vit) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Интеллект (int)"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Интеллект (int) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Воля"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Воля (wil) %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Нажмите ОК, чтобы возродиться."
@@ -4393,16 +5149,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Некорректный номер слота."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Сведения"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Игрок удален."
@@ -4466,10 +5212,6 @@ msgstr "%s был вышвырнут %s"
 msgid "Unknown channel event."
 msgstr "Неизвестное событие на канале."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Гильдия создана."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Ошибка создания гильдии"
@@ -4502,10 +5244,6 @@ msgstr "Учетная запись заблокирована (бан)."
 msgid "New password incorrect."
 msgstr "Новый пароль указан неверно"
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Старый пароль указан неверно."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Вы не вошли под своим именем. Пожалуйста, авторизуйтесь"
@@ -4585,24 +5323,11 @@ msgstr "Принимать входящие предложения торгов�
 msgid "Ignoring incoming trade requests."
 msgstr "Игнорировать входящие предложения торговли."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Торговля с %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Торговля отменена."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Торговля завершена."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Не удалось вышвырнуть!"
@@ -4793,5 +5518,3 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
-
-
diff --git a/po/sk.po b/po/sk.po
index df2e25c69..1b29e9bca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,2987 +1,4661 @@
-# Slovak translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-06-08 22:09+0000\n"
-"Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Pripájam sa..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Prihlásenie"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Vyberte postavu"
+msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Heslo:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Zrušiť registráciu"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr "Neznámy príkaz."
-
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Pomoc --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
+msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Príkaz: /hel"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "Príkaz: /help <príkaz>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Príkaz: /announce <správa>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** prístupné iba pre GM ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Tento príkaz pošle správu <správa> všetkým pripojeným používateľom."
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Príkaz: /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Príkaz: /announce <správa>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Príkaz: /clear"
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Príkaz: /announce <správa>"
-
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "Príkaz: /where"
-
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "Príkaz: /who"
-
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
-
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "Napíš /help pre zoznam príkazov."
-
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/game.cpp:1577
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/beingpopup.cpp:118
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:132
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Guild: %s"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:946
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Nie je možné  vstúpiť do párty!"
-
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Predaj"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "Zmeniť Emailovú adresu"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Používateľské meno musí byť najmenej %d písmen dlhé."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Používateľské meno musí byt menšie než %d."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Heslo musí byť aspoň %d písmen dlhé."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Heslo musí byť menšie %d ako písmen."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Meno"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "Farba vlasov:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "Štýl vlasov:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prosím rozdeľ %d bodov"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tvoje meno musí mať aspoň 4 písmená."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "Charakterové staty OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potvrďte zmazanie postavy"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "Účet a správa postáv"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "Zmeniť Emailovú adresu"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "Zatvoriť"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "Áno"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Meno: %s"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Minimap: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:176
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
+#: src/gui/debugwindow.cpp:231
+#, c-format
 msgid "Particle count: %d"
-msgstr "Účet: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Particle detail: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Ambient FX: %s"
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "Potvrdiť"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Odstrojiť"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "Nápoveda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "Zatvoriť"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventár"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Zahodiť"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Zahodiť"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "Potvrdiť"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "Effekt: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, 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] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "Zapamätať si používateľské meno"
+msgstr ""
+
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "Vyberte Server"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Nasledujúci"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Odstrojiť"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@obchod|Obchodovať s %s@@"
-
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "@@útok|Útok %s@@"
-
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "Nápoveda pre %s: %s"
-
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@párti|Pozvať %s pridať sa do tvoje párti@@"
-
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@párti|Pozvať %s pridať sa do tvoje párti@@"
-
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Zmeniť server"
-
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Vymeniť postavu"
-
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr "Zmeniť server"
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr "Vymeniť postavu"
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Používateľské meno musí byť najmenej %d písmen dlhé."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Používateľské meno musí byt menšie než %d."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Heslo musí byť aspoň %d písmen dlhé."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí byť menšie %d ako písmen."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "Pripájam sa..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "Vyberte Server"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Zvuk"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "Sfx zvuk"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "Hudobný zvuk"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Použiť"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nie"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "Schopnosti"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Level: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Level: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Naozaj chcete odstrániť túto postavu?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Naozaj chcete odstrániť túto postavu?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "Vytvoriť postavu"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "Klany, aliancie, guildy"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Peniaze: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Charakterové staty OK"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Meno: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "Globálne oznámenie:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globálne oznámenie od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "Nápoveda pre %s: %s"
-
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "Príkaz: /where"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "Skratka"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "Vyberte Server"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
-msgstr "Sila:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
-msgstr "Čulosť:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
-msgstr "Vitalita:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
-msgstr "Inteligencia:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
-msgstr "Obratnosť:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "Meno"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Vytvorenie postavy sa nepodarilo"
-
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Vymazať"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
-#, c-format
-msgid "% Accuracy"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, c-format
-msgid "% Evade"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Critical"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Neznámy príkaz."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Zrušiť registráciu"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Zmeniť heslo"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2989,644 +4663,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Obchod sa nepodaril!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Zobrazenie smajlíka sa nepodarilo!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Sadnutie sa nepodarilo!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Vytvorenie postavy sa nepodarilo"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Nie je možné  vstúpiť do párty!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Nemôžem kričať!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Ešte si nedosiahol dostatočne vysokú úroveť!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Nedostatok HP!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Nedostatok SP!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "Nemáš žiadne poznámky!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "Práve teraz to nemôžeš robiť."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Nemôžeš použiť túto zručnosť s touto zbraňou!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Potrebuješ ďaľší červený gem!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Potrebuješ ďaľší modrý gem!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Nosíš veľa, aby si mohol spraviť toto!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Heh? Čo to je?"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Warp sa nepodaril ..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Nedá sa kradnúť ..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Jed nemá žiaden účinnok ..."
-
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "Charakterové staty OK"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "Charakterové staty OK"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "Zvoľte množstvo vecí k predaju."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Neznámy príkaz."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Sila vôle:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Neznámy príkaz."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Sila vôle:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
+msgid "Strength %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
+msgid "Agility %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+msgid "Intelligence %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
 msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Popis: %s"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Predchádzajúci"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Nový"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Pracovná úroveň: %d"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ano"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@zrušiť|Zrušiť@@"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@použiť|Odstrojiť@@"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@použiť|Obliecť@@"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@použiť|Použiť@@"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
+
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
+
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr ""
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@vyhodiť|Vyhodiť@@"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@rozdeliť|Rozdeliť@@"
diff --git a/po/sq.po b/po/sq.po
index 71c3fa049..b70f85508 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,2952 +1,4653 @@
-# Albanian translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-02 10:47+0000\n"
-"Last-Translator: Jat Lee <Unknown>\n"
-"Language-Team: Albanian <sq@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Ndihmë--"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/ndihmë > Ndihmë përeth disa komandave"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/ku > Emri i mapit ku gjendesh"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr ""
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/kush > Numri i lojtarëve online"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/unë >Trego diqka për veten"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr ""
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/pastro > Pastro këtë dritare"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
+msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/mesazh > Dërgo mesazh privat te playeri që dëshiron"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
+msgstr ""
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/pëshpëritje > pseudonim i mesazhit"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
+msgstr ""
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > pseudonim i mesazhit"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr ""
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+msgid "Buy"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#, c-format
+msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+msgid "+"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+msgid "-"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
+msgid "Quit"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+msgid "Max"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+msgid "Shop"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
+msgid "Sell"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
+msgid "Cancel"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
-msgid "Requesting to join channel %s."
+msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/gui/charcreatedialog.cpp:58
+msgid "Create Character"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
+msgid "Name:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+msgid ">"
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+msgid "<"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/gui/charcreatedialog.cpp:80
+msgid "Hair color:"
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/gui/charcreatedialog.cpp:83
+msgid "Hair style:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
+msgid "Create"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+msgid "Male"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+msgid "Female"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#, c-format
+msgid "Please distribute %d points"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/charcreatedialog.cpp:219
+msgid "Your name needs to be at least 4 characters."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:291
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Please remove %d points"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/charselectdialog.cpp:77
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/charselectdialog.cpp:78
+msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/charselectdialog.cpp:126
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/charselectdialog.cpp:162
+msgid "Change Email"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+msgid "Delete"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
+#: src/gui/charselectdialog.cpp:467
+msgid "Choose"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/charselectdialog.cpp:470
 #, c-format
-msgid "Price: %s / Total: %s"
+msgid "Level %d"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
-msgid "+"
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+msgid "(empty)"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
-msgid "-"
+#: src/gui/chatwindow.cpp:112
+msgid "default"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
+#: src/gui/chatwindow.cpp:113
+msgid "black"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
-msgid "Max"
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
+#: src/gui/chatwindow.cpp:115
+msgid "green"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
-#, c-format
-msgid "Account: %s"
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+msgid "Chat"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/chatwindow.cpp:605
 #, c-format
-msgid "The new password needs to be at least %d characters long."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/chatwindow.cpp:988
 #, c-format
-msgid "The new password needs to be less than %d characters long."
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
-msgid "Create"
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Please remove %d points"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
+#: src/gui/debugwindow.cpp:176
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
-msgid "Chat"
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
 msgstr ""
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "%d FPS"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Music: %s"
+msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:537
 #, c-format
-msgid "Lvl: %d"
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/ndihmë > Ndihmë përeth disa komandave"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Unknown command > Komand e panjohur"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
-
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2954,607 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Unknown command > Komand e panjohur"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Unknown command > Komand e panjohur"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+
diff --git a/po/sv.po b/po/sv.po
index d542679af..879bc828a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,128 +1,126 @@
-# Swedish translation for mana
-# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2009-07-17 05:36+0000\n"
-"Last-Translator: Kess Vargavind <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"Language: sv\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1030
-#, fuzzy
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr "Synliga namn"
+msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:900
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Ansluter till kartservern..."
+msgstr ""
 
-#: src/client.cpp:931
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Användarnamn"
+msgstr ""
 
-#: src/client.cpp:964
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1056
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "Välj karaktär"
+msgstr ""
 
-#: src/client.cpp:1087
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "Ansluter till kartservern..."
+msgstr ""
 
-#: src/client.cpp:1097
-#, fuzzy
+#: src/client.cpp:1113
 msgid "Changing game servers"
-msgstr "Server"
+msgstr ""
 
-#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1177
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Lösenord:"
+msgstr ""
 
-#: src/client.cpp:1178
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1197
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Ändra"
+msgstr ""
 
-#: src/client.cpp:1198
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "Medlem befordrad."
+msgstr ""
 
-#: src/client.cpp:1218
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Avregistrera"
+msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
-#: src/client.cpp:1898
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1612
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Ogiltig uppdateringsvärd: "
+msgstr ""
 
-#: src/client.cpp:1646 src/client.cpp:1652
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1673
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -138,8 +136,8 @@ msgstr "Behöver en text att viska!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
 "fliken redan eller så försöker du viska till dig själv."
@@ -149,14 +147,13 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Du måste ange gruppens namn."
 
 #: src/commandhandler.cpp:456
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Du måste ange gruppens namn."
+msgstr ""
 
 #: src/commandhandler.cpp:469 src/commandhandler.cpp:576
 #: src/commandhandler.cpp:617 src/commandhandler.cpp:647
@@ -180,34 +177,31 @@ msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
 #: src/commandhandler.cpp:555
-#, fuzzy
 msgid "friend"
-msgstr "Vän"
+msgstr ""
 
 #: src/commandhandler.cpp:560
-#, fuzzy
 msgid "disregarded"
-msgstr "Förbisedd"
+msgstr ""
 
 #: src/commandhandler.cpp:565
-#, fuzzy
 msgid "neutral"
-msgstr "Neutral"
+msgstr ""
 
 #: src/commandhandler.cpp:584
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
 #: src/commandhandler.cpp:598
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Grupp skapad."
+msgstr ""
 
 #: src/commandhandler.cpp:606
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
 #: src/commandhandler.cpp:628
 msgid "Player wasn't ignored!"
@@ -218,24 +212,20 @@ msgid "Player no longer ignored!"
 msgstr ""
 
 #: src/commandhandler.cpp:637
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
 #: src/commandhandler.cpp:654
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
 #: src/commandhandler.cpp:665
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Grupp skapad."
+msgstr ""
 
 #: src/commandhandler.cpp:667
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
 #: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
@@ -278,24 +268,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "font cache size"
-msgstr "Typsnittsgrad"
+msgstr ""
 
 #: src/commandhandler.cpp:1094
-#, fuzzy
 msgid "Cache size:"
-msgstr "Typsnittsgrad"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Skapa"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Ta bort"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -310,109 +296,102 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
-#, fuzzy
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Skärmbild sparades till ~/"
+msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:511
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
-"Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/game.cpp:1425
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Kunde inte ladda karta"
+msgstr ""
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
 
-#: src/gui/beingpopup.cpp:108
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Grupp (%s)"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:122
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:132
+#, c-format
 msgid "Guild: %s"
-msgstr "Gillen"
+msgstr ""
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:146
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:156
+#, c-format
 msgid "Comment: %s"
-msgstr "Kommando: /list"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "Chattfönster"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Namn"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Prata"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
-#, fuzzy
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
-msgstr "Gå uppåt"
+msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Återställ"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Köp"
 
@@ -441,7 +420,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -452,31 +431,31 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sälj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -492,24 +471,22 @@ msgid "Account: %s"
 msgstr "Konto: %s"
 
 #: src/gui/changeemaildialog.cpp:54
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Ange den nya epostadressen två gånger:"
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Användarnamnet måste vara minst %d tecken långt."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Användarnamnet måste vara kortare än %d tecken."
+msgstr ""
 
 #: src/gui/changeemaildialog.cpp:146
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Den nya epostadressen används redan."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
 #: src/gui/charselectdialog.cpp:140
@@ -522,23 +499,22 @@ msgid "Password:"
 msgstr "Lösenord:"
 
 #: src/gui/changepassworddialog.cpp:66
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Ange det nya lösenordet två gånger:"
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Lösenordet måste vara minst %d tecken långt."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Lösenordet måste vara kortare än %d tecken."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
@@ -568,14 +544,12 @@ msgid "<"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:80
-#, fuzzy
 msgid "Hair color:"
-msgstr "Hårfärg:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:83
-#, fuzzy
 msgid "Hair style:"
-msgstr "Frisyr:"
+msgstr ""
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
@@ -634,82 +608,71 @@ msgid "Unregister"
 msgstr "Avregistrera"
 
 #: src/gui/charselectdialog.cpp:162
-#, fuzzy
 msgid "Change Email"
-msgstr "Ändra epostadress"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Fel lösenord"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Kunde inte ta bort karaktär."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Fel lösenord"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Ta bort"
 
 #: src/gui/charselectdialog.cpp:467
-#, fuzzy
 msgid "Choose"
-msgstr "Stäng"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:470
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Nivå: %d"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
-msgstr "Förval"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Vän"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Grön: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Blå: "
+msgstr ""
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "låg"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Länk"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
@@ -720,30 +683,26 @@ msgid "grey"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Kastvapen"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Regnbåge"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Regnbåge"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Regnbåge"
+msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -751,12 +710,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chatwindow.cpp:589
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d spelare är närvarande."
+msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -770,61 +729,53 @@ msgid "No"
 msgstr "Nej"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
-#, fuzzy
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
-msgstr "Ignorerad"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Karta"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Gå åt vänster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Nästa"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
-#, fuzzy
 msgid "Music:"
-msgstr "Ämne: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:251
-#, fuzzy
 msgid "Map:"
-msgstr "Namn: %s"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:250
-#, fuzzy
 msgid "Minimap:"
-msgstr "Minikarta"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
 #: src/gui/debugwindow.cpp:247
-#, fuzzy
 msgid "Cursor:"
-msgstr "Särskild muspekare"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Player Position:"
-msgstr "Spelare slår monster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Partikeleffekter"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -856,51 +807,44 @@ msgid "Textures count:"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:231
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Partikeleffekter"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
 #: src/gui/debugwindow.cpp:343
-#, fuzzy
 msgid "Target:"
-msgstr "Gå åt vänster"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
 #: src/gui/debugwindow.cpp:344
-#, fuzzy
 msgid "Target Id:"
-msgstr "Välj spelare"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
 #: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-#, fuzzy
 msgid "Target Level:"
-msgstr "Välj spelare"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
-#, fuzzy
 msgid "Target Party:"
-msgstr "Välj spelare"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Välj spelare"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Attack %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Minikarta"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -909,9 +853,8 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Kritisk träff"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
@@ -933,28 +876,25 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Stäng"
 
 #: src/gui/didyouknowwindow.cpp:62
-#, fuzzy
 msgid "< Previous"
-msgstr "Föregående"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63
-#, fuzzy
 msgid "Next >"
-msgstr "Nästa"
+msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "Okej"
 
@@ -962,10 +902,10 @@ msgstr "Okej"
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -973,84 +913,80 @@ msgstr "Avrusta"
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "Utrymme:"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-#, fuzzy
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
-msgstr "Port:"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:121
-#, fuzzy
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
-msgstr "en"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-#, fuzzy
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
-msgstr "en"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "Släpp"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Släpp"
@@ -1088,107 +1024,103 @@ msgid "Add to sell shop."
 msgstr ""
 
 #: src/gui/itemamountwindow.cpp:282
-#, fuzzy
 msgid "Unknown."
-msgstr "Okänt fel"
+msgstr ""
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Vikt: "
+msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
-#, fuzzy
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "Statusfönster"
+msgstr ""
 
-#: src/gui/killstats.cpp:63
-#, fuzzy
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr "Återställ"
+msgstr ""
 
-#: src/gui/killstats.cpp:64
-#, fuzzy
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
-msgstr "Återställ"
+msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Nivå: %d"
+msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Pris: %s / Totalt: %s"
+msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1197,9 +1129,8 @@ msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-#, fuzzy
 msgid "Auto Close"
-msgstr "Stäng"
+msgstr ""
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1219,9 +1150,8 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/logindialog.cpp:110
-#, fuzzy
 msgid "Remember username"
-msgstr "Kom ihåg användarnamnet"
+msgstr ""
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
@@ -1232,18 +1162,16 @@ msgid "Register"
 msgstr "Registrera"
 
 #: src/gui/logindialog.cpp:122
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr ""
 
 #: src/gui/ministatus.cpp:59
 msgid "health bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:65
-#, fuzzy
 msgid "mana bar"
-msgstr "mana"
+msgstr ""
 
 #: src/gui/ministatus.cpp:77
 msgid "experience bar"
@@ -1254,27 +1182,24 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:92
-#, fuzzy
 msgid "weight bar"
-msgstr "Vikt: "
+msgstr ""
 
 #: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:98
-#, fuzzy
 msgid "money bar"
-msgstr "Monster slår spelare"
+msgstr ""
 
 #: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:104
-#, fuzzy
 msgid "status bar"
-msgstr "Status"
+msgstr ""
 
 #: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
@@ -1293,18 +1218,17 @@ msgid "Submit"
 msgstr "Vidare"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
-#, fuzzy
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
-msgstr "Spjut"
+msgstr ""
 
 #: src/gui/npcdialog.cpp:222
-#, fuzzy
 msgid "> Next"
-msgstr "Nästa"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1317,8 +1241,8 @@ msgstr "Skicka"
 #: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
-"Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är "
-"ogiltigt."
+"Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är"
+" ogiltigt."
 
 #: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
@@ -1326,364 +1250,329 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Pengar: %s"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:87
-#, fuzzy
 msgid "Unequip first"
-msgstr "Avrusta"
+msgstr ""
 
 #: src/gui/outfitwindow.cpp:90
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
-msgstr "Viskning"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
-#, fuzzy
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
-msgstr "Vän"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
-#, fuzzy
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
-msgstr "Förbisedd"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
-#, fuzzy
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
-msgstr "Ignorerad"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Ignorera %s fullständigt@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
-#, fuzzy
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
-msgstr "låg"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
-#, fuzzy
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
-msgstr "Ändra epostadress"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
-msgstr "/party > Bjud in en spelare till din grupp"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
-#, fuzzy
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
-msgstr "@@admin-kick|Sparka spelare@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
-#, fuzzy
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
-msgstr "@@admin-kick|Sparka spelare@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
-#, fuzzy
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
-msgstr "Ändra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
-#, fuzzy
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
-msgstr "/party > Bjud in en spelare till din grupp"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
-#, fuzzy
 msgid "Kick player"
-msgstr "Kunde inte sparka ut!"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
-#, fuzzy
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
-msgstr "Visa namn"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
-#, fuzzy
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
-msgstr "@@attack|Attackera %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:296
-#, fuzzy
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
-msgstr "@@attack|Attackera %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:299
-#, fuzzy
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
-#, fuzzy
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:461
-#, fuzzy
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
-msgstr "Plocka upp"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
-#, fuzzy
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
-msgstr "Kom ihåg användarnamnet"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
-#, fuzzy
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
-msgstr "Kom ihåg användarnamnet"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
-#, fuzzy
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
-msgstr "Flikmarkering"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:545
-#, fuzzy
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
-msgstr "Flikmarkering"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
-msgstr "Kom ihåg användarnamnet"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-#, fuzzy
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
-msgstr "Kan inte köpa."
+msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
-msgstr "Tillåt/neka handel"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
-#, fuzzy
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr "Stor"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:715
-#, fuzzy
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
-msgstr "Ändra"
+msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
-#, fuzzy
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1547
-#, fuzzy
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
-#, fuzzy
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
-#, fuzzy
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
-#, fuzzy
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1567
-#, fuzzy
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1569
-#, fuzzy
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
-msgstr "Lagra"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
-#, fuzzy
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
-msgstr "Släpp"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
-#, fuzzy
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
-msgstr "Hämta"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1611
-#, fuzzy
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
-msgstr "Hämta"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
-#, fuzzy
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
-msgstr "Hämta"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
-#, fuzzy
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
-msgstr "@@chat|Nämn i chattfönstret@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Förval"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
-#, fuzzy
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
-msgstr "Gå uppåt"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
-#, fuzzy
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
-msgstr "Gå nedåt"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
@@ -1730,14 +1619,12 @@ msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
 #: src/gui/serverdialog.cpp:228
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Välj din server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Välj din server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1748,23 +1635,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:287
-#, fuzzy
 msgid "Connect"
-msgstr "Ansluter..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:288
-#, fuzzy
 msgid "Custom Server"
-msgstr "Särskild muspekare"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
@@ -1776,9 +1660,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:556
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Väntar på server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
@@ -1810,14 +1693,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:53
-#, fuzzy
 msgid "Enable music"
-msgstr "Aktivera joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Aktivera joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -1836,9 +1717,8 @@ msgid "Music volume"
 msgstr "Musikvolym"
 
 #: src/gui/setup_audio.cpp:120
-#, fuzzy
 msgid "Notice"
-msgstr "Ingen text"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1848,67 +1728,95 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Färger"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-#, fuzzy
-msgid "Enable trade tab"
-msgstr "Kan inte köpa."
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Visa alla viskningar i egna flikar"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr "Kan inte köpa."
+msgstr ""
 
-#: src/gui/setup_chat.cpp:91
-#, fuzzy
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr "Visa namn"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:94
-#, fuzzy
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr "Nästa chattflik"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1916,14 +1824,9 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Färger"
-
 #: src/gui/setup_colors.cpp:75
-#, fuzzy
 msgid "Type:"
-msgstr "Typ: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1945,39 +1848,34 @@ msgid "Spectrum"
 msgstr "Spektrum"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
-#, fuzzy
 msgid "Delay:"
-msgstr "Fördröjning: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:112
-#, fuzzy
 msgid "Red:"
-msgstr "Röd: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:127
-#, fuzzy
 msgid "Green:"
-msgstr "Grön: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:142
-#, fuzzy
 msgid "Blue:"
-msgstr "Blå: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
 
@@ -2014,9 +1912,8 @@ msgid "Assign"
 msgstr "Tilldela"
 
 #: src/gui/setup_keyboard.cpp:93
-#, fuzzy
 msgid "Unassign"
-msgstr "Tilldela"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -2030,487 +1927,515 @@ msgstr "Samma tangent används på flera ställen."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monster"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Kan inte köpa."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Markering"
+msgid "Show monster hp bar"
+msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-#, fuzzy
-msgid "Highlight floor items"
-msgstr "Markering"
-
 #: src/gui/setup_other.cpp:67
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Aktivera joystick"
+msgid "Show warps particles"
+msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-#, fuzzy
-msgid "Show warps particles"
-msgstr "som partikel"
+msgid "Highlight floor items"
+msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Visa namn"
+msgid "Moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
-#, fuzzy
-msgid "Show own hp bar"
-msgstr "Visa namn"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Aktivera joystick"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-#, fuzzy
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
-msgstr "Meddelande"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
 
-#: src/gui/setup_other.cpp:114
-#, fuzzy
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr "Kan inte köpa."
+msgstr ""
 
-#: src/gui/setup_other.cpp:117
-#, fuzzy
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr "Tillåt/neka handel"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
-#, fuzzy
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
-msgstr "Kan inte köpa."
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Spelare"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:57
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Synliga namn"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:70
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:71
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Vän"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: src/gui/setup_players.cpp:73
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: src/gui/setup_players.cpp:74
+#: src/gui/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: src/gui/setup_players.cpp:252
+#: src/gui/setup_relations.cpp:244
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Visa alla viskningar i egna flikar"
-
-#: src/gui/setup_players.cpp:257
-#, fuzzy
-msgid "Show gender"
-msgstr "Visa namn"
-
-#: src/gui/setup_players.cpp:265
-msgid "Players"
-msgstr "Spelare"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
-#: src/gui/setup_players.cpp:313
-#, fuzzy
-msgid "Show level"
-msgstr "Visa namn"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:317
-#, fuzzy
-msgid "Show own name"
-msgstr "Visa namn"
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:321
-#, fuzzy
-msgid "Target dead players"
-msgstr "Välj spelare"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:325
-#, fuzzy
-msgid "Secure trades"
-msgstr "Godkänn handel"
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
-msgid "Unsecure chars in names"
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-#, fuzzy
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
-msgstr "Partikeleffekter"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-#, fuzzy
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr "Hjälp"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-#, fuzzy
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
-msgstr "Godkänn handel"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Typsnittsgrad"
 
-#: src/gui/setup_theme.cpp:241
-#, fuzzy
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr "Ändra"
+msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Pytteliten"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Liten"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Mellan"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Stor"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-#, fuzzy
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:224
-#, fuzzy
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Ingen text"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Textbubblor utan namn"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Textbubblor med namn"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "maximal"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:328
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Relation"
-
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Synliga namn"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Visa erhållna saker"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "i chattfönster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "som partikel"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Aktivera joystick"
-
-#: src/gui/setup_video.cpp:353
-#, fuzzy
-msgid "Show background"
-msgstr "Bakgrund"
-
-#: src/gui/setup_video.cpp:358
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS-gräns:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
-#, fuzzy
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr "FPS-gräns:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Text ovanför huvudet"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:380
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "Partikeldetaljer"
-
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Typsnittsgrad"
+msgstr ""
 
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Nej"
+msgstr ""
 
-#: src/gui/setup_video.cpp:583
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "läge och återgång till det gamla läget misslyckades också!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:589
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "läge och återgång till det gamla läget misslyckades också!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:600
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "Byte till helskärm"
+msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:613
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "Ändrar OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
-#, fuzzy
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "Skärmupplösning ändrad"
+msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "Inställningar för partikeleffekter ändrade."
+msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
@@ -2527,7 +2452,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Lägg till"
 
@@ -2539,15 +2464,15 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
 #: src/gui/shopwindow.cpp:724
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s vill byteshandla med dig, accepterar du?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2558,31 +2483,31 @@ msgid "Up"
 msgstr "Upp"
 
 #: src/gui/skilldialog.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Färdighetspoäng: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:413
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Färdighetspoäng: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:425
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Färdigheter"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Nivå: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Nivå: %d"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gille"
 
@@ -2592,9 +2517,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Gille skapat."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2606,23 +2531,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:197
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Skapa gille"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:198
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Är du säker på att du vill avsluta?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupp"
 
 #: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Bjud in en spelare till din grupp"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2630,9 +2554,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:284
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Bjud in en spelare till din grupp"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:285
 #, c-format
@@ -2644,75 +2567,70 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:295
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Är du säker på att du vill avsluta?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Attackera"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Attackera"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignorerad"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Skapa gille"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
-#, fuzzy
 msgid "Create Party"
-msgstr "Skapa karaktär"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
-#, fuzzy
 msgid "Invite"
-msgstr "Bjud in spelare"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1176
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Accepterade injudan från %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1186
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Avslog inbjudan från %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1203
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Accepterade injudan från %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1213
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Avslog inbjudan från %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Kunde inte skapa gille."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2720,43 +2638,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1294
-#, fuzzy
 msgid "Guild Name"
-msgstr "Gille"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1295
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Välj din server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1309
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s har bjudit in dig till %ss grupp."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Acceptera gruppinbjudan"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
 #: src/gui/socialwindow.cpp:1347
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s har bjudit in dig till sin grupp."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1351
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s har bjudit in dig till %ss grupp."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2777,263 +2690,254 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
-#, fuzzy
 msgid "Party Name"
-msgstr "Grupp"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1394
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Välj din server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
-#, fuzzy
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr "Gå åt vänster"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
-#, fuzzy
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr "Gå åt vänster"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
-#, fuzzy
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr "Attackera"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
-#, fuzzy
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr "Byt karaktär"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
-#, fuzzy
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr "Byt karaktär"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
-#, fuzzy
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr "Byt karaktär"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
-#, fuzzy
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr "Tangentbord"
+msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3071,19 +2975,19 @@ msgid "Job:"
 msgstr "Jobb:"
 
 #: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Karaktärens värden okej"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:254
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Nivå: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Färdighetspoäng: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
 #: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
@@ -3212,99 +3116,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr "Gå åt vänster"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "Tillåt byteshandel"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr "Gå åt vänster"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr "Allmänt"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr "Kommando: /item"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr "Magi"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "Kommando: /who"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr "Välj spelare"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr "Maxnivå"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
-#, fuzzy
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr "Visa namn"
+msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3328,26 +3220,27 @@ msgstr "Godkänt. Väntar…"
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "Du får %s."
+msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
 "sak flera gånger."
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
@@ -3368,22 +3261,21 @@ msgstr "Ansluter..."
 msgid "Play"
 msgstr "Spela"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1  du försöker igen senare"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Färdig"
 
@@ -3392,24 +3284,20 @@ msgid "Being"
 msgstr "Varelse"
 
 #: src/gui/userpalette.cpp:117
-#, fuzzy
 msgid "Friend Names"
-msgstr "Vän"
+msgstr ""
 
 #: src/gui/userpalette.cpp:118
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Förbisedd"
+msgstr ""
 
 #: src/gui/userpalette.cpp:119
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignorerad"
+msgstr ""
 
 #: src/gui/userpalette.cpp:120
-#, fuzzy
 msgid "Erased Names"
-msgstr "GM-namn"
+msgstr ""
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3427,28 +3315,21 @@ msgstr "GM-namn"
 msgid "NPCs"
 msgstr "NPC:er"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monster"
-
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Monster slår spelare"
+msgstr ""
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:129
-#, fuzzy
 msgid "Party Members"
-msgstr "Grupp"
+msgstr ""
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Guild Members"
-msgstr "Gille"
+msgstr ""
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3463,76 +3344,64 @@ msgid "Exp Notification"
 msgstr "XP-notifiering"
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Monster slår spelare"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:137
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Spelare slår monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:138
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Monster slår spelare"
+msgstr ""
 
 #: src/gui/userpalette.cpp:140
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Andra spelares namn"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
 msgstr "Kritisk träff"
 
 #: src/gui/userpalette.cpp:143
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Spelare slår monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Spelare slår monster"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
-#, fuzzy
 msgid "Local Player Miss"
-msgstr "Kom ihåg spelarlista"
+msgstr ""
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
 msgstr "Missar"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Flikmarkering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Markering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Markering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Markering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Flikmarkering"
+msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3543,9 +3412,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:163
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Monster slår spelare"
+msgstr ""
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3559,23 +3427,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3586,7 +3454,8 @@ msgstr ""
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
-"/users > Visar en lista över de spelare som finns i den aktuella chattkanalen"
+"/users > Visar en lista över de spelare som finns i den aktuella "
+"chattkanalen"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
@@ -3641,10 +3510,11 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
+"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt "
+"det."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3678,9 +3548,9 @@ msgid "Global announcement from %s:"
 msgstr "Globalt meddelande från %s:"
 
 #: src/gui/widgets/chattab.cpp:184
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s viskar: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3703,33 +3573,29 @@ msgid "This command closes the current whisper tab."
 msgstr "Det här kommandot stänger aktuell viskningsflik."
 
 #: src/gui/widgets/whispertab.cpp:124
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Kommando: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:125
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:130
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Kommando: /item <alternativ>"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Bot checker"
-msgstr "Chattfönster"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3744,9 +3610,8 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:71
-#, fuzzy
 msgid "Smilies"
-msgstr "Smiley"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3781,9 +3646,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:94
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Genvägar"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3806,23 +3670,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Select World"
-msgstr "Välj okej"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
-#, fuzzy
 msgid "Change Login"
-msgstr "Ändra"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:83
-#, fuzzy
 msgid "Choose World"
-msgstr "Välj din server"
+msgstr ""
 
 #: src/inventory.cpp:248
 msgid "Storage"
-msgstr "Lagring"
+msgstr ""
 
 #: src/inventory.cpp:250
 msgid "Cart"
@@ -3849,9 +3710,8 @@ msgid "Target & Attack"
 msgstr "Välj & attackera"
 
 #: src/keyboardconfig.cpp:51
-#, fuzzy
 msgid "Move to Target"
-msgstr "Gå åt vänster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
@@ -3878,9 +3738,8 @@ msgid "Stop Attack"
 msgstr "Sluta attackera"
 
 #: src/keyboardconfig.cpp:64
-#, fuzzy
 msgid "Target Closest"
-msgstr "Välj närmaste"
+msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3915,14 +3774,12 @@ msgid "Enable/Disable Trading"
 msgstr "Tillåt/neka handel"
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Ändra epostadress"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Tangent för snabbåtkomst %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
@@ -3934,7 +3791,7 @@ msgstr "Tangent för snabbåtkomst %d"
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tangent för snabbåtkomst %d"
@@ -3980,43 +3837,36 @@ msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Social Window"
-msgstr "Färdighetsfönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "Smileyfönster"
 
 #: src/keyboardconfig.cpp:146
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Statusfönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:148
-#, fuzzy
 msgid "Shop Window"
-msgstr "Inställningsfönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:150
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Dölj fönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Statusfönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
-#, fuzzy
 msgid "Commands Window"
-msgstr "Kommando: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Chattfönster"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
@@ -4027,14 +3877,12 @@ msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Föregående chattflik"
+msgstr ""
 
 #: src/keyboardconfig.cpp:166
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Nästa chattflik"
+msgstr ""
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -4058,7 +3906,7 @@ msgstr "Nästa chattflik"
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Tangent för smiley %d"
@@ -4095,219 +3943,205 @@ msgstr "Föregående chattflik"
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr "Föregående chattflik"
+msgstr ""
 
-#: src/keyboardconfig.cpp:279
-#, fuzzy
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr "Nästa chattflik"
+msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "Välj okej"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
-#, fuzzy
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr "Gå nedåt"
+msgstr ""
 
-#: src/keyboardconfig.cpp:295
-#, fuzzy
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr "Gå åt vänster"
+msgstr ""
 
-#: src/keyboardconfig.cpp:296
-#, fuzzy
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr "Gå åt höger"
+msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
-#, fuzzy
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr "Byt karaktär"
+msgstr ""
 
-#: src/keyboardconfig.cpp:316
-#, fuzzy
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
-#, fuzzy
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr "Välj & attackera"
+msgstr ""
 
-#: src/keyboardconfig.cpp:322
-#, fuzzy
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr "Ändra lösenord"
+msgstr ""
 
-#: src/keyboardconfig.cpp:324
-#, fuzzy
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr "Ändra epostadress"
+msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
-#, fuzzy
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr "Tillåt/neka handel"
+msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
+msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1375
-#, fuzzy
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
-msgstr "Kunde inte plocka upp."
+msgstr ""
 
-#: src/localplayer.cpp:1377
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1381
-#, fuzzy
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
-msgstr "Servern är full"
+msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1386
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1389
-#, fuzzy
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
-msgstr "Kunde inte plocka upp."
+msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1413
-#, fuzzy, c-format
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
-msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/localplayer.cpp:3142
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
-#, fuzzy
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
-msgstr " avbruten"
+msgstr ""
 
-#: src/localplayer.cpp:3455
-#, fuzzy
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
-msgstr "Ändra epostadress"
+msgstr ""
 
-#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
-#, fuzzy
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
-msgstr " avbruten"
+msgstr ""
 
-#: src/localplayer.cpp:3817
-#, fuzzy
+#: src/localplayer.cpp:3849
 msgid "You see "
-msgstr "Du får %s."
+msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4330,93 +4164,76 @@ msgid "Options:"
 msgstr "Alternativ:"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Konfigurationsfil att använda"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Konfigurationsfil att använda"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version     : Visa aktuell version"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Visa den här hjälpen"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Konfigurationsfil att använda"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username    : Logga in med det här användarnamnet"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password    : Logga in med det här lösenordet"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character   : Logga in med den här karaktären"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server      : Namn eller IP-adress för inloggningsserver"
+msgstr ""
 
 #: src/main.cpp:62
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port        : Port på inloggningsserver"
+msgstr ""
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Använd den här uppdateringsvärden"
+msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
+msgstr ""
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data        : Katalog att hämta speldata från"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
+msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
+msgstr ""
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:74
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
+msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4430,2144 +4247,1231 @@ msgstr "Tack för köpet."
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
-msgid "Strength"
-msgstr "Styrka"
-
-#: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Styrka %+d"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
-msgid "Agility"
-msgstr "Smidighet"
-
-#: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Smidighet %+d"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
-msgid "Dexterity"
-msgstr "Skicklighet"
-
-#: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Skicklighet %+d"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
-msgid "Vitality"
-msgstr "Hälsa"
-
-#: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Livskraft %+d"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
-msgid "Intelligence"
-msgstr "Intelligens"
-
-#: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligens %+d"
-
-#: src/net/manaserv/attributes.cpp:225
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrka:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Viljekraft %+d"
-
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Du är död."
-
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Du är inte så värst levande längre."
-
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Liemannens svala händer sträcker sig efter din själ."
-
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Spelet är slut!"
-
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
-"ställe."
-
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
-"misslyckades."
-
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "Jag antar att det kunde gått bättre."
-
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Vill du att dina tillhörigheter ska identifieras?"
-
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
-
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Tillintetgjord."
-
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Verkar som att som att någon gav dig ditt huvud."
-
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
-"ny."
-
-#: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Klicka okej för att återuppstå"
-
-#: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
-msgid "You Died"
-msgstr "Du dog"
-
-#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
-#, fuzzy
-msgid "Not logged in."
-msgstr "Redan inloggad"
-
-#: src/net/manaserv/charhandler.cpp:148
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:151
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Användarnamnet finns redan"
-
-#: src/net/manaserv/charhandler.cpp:157
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:160
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:163
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karaktärens värden okej"
-
-#: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karaktärens värden okej"
-
-#: src/net/manaserv/charhandler.cpp:172
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:178
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
-#, fuzzy
-msgid "Unknown error."
-msgstr "Okänt fel"
-
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
-msgid "Info"
-msgstr "Information"
-
-#: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
-msgid "Player deleted."
-msgstr "Karaktär borttagen."
-
-#: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Välj antal föremål att handla med."
-
-#: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Okänt fel"
-
-#: src/net/manaserv/charhandler.cpp:261
-msgid "No gameservers are available."
-msgstr "Ingen spelserver finns tillgänglig."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Ämne: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spelare slår monster"
-
-#: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: /join <chattkanal>"
-
-#: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
-msgid "Listing channels."
-msgstr "Skickar förfrågan att gå in i chattkanalen %s."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s anslöt sig till gruppen."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Okänt kommando."
-
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
-msgid "Guild created."
-msgstr "Gille skapat."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Kunde inte skapa gille."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Inbjudan skickad."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Medlem befordrad."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Kunde inte befordra medlem."
-
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Fel magic_token"
-
-#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
-msgid "Already logged in."
-msgstr "Redan inloggad"
-
-#: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
-msgid "Account banned."
-msgstr "Konto raderat"
-
-#: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Det nya lösenordet stämmer inte överens"
-
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamla lösenordet är fel"
-
-#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
-msgid "Account not connected. Please login first."
-msgstr "Kontot är inte anslutet. Var god logga in först."
-
-#: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nya epostadressen är felaktig."
-
-#: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamla epostadressen är fel."
-
-#: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nya epostadressen används redan."
-
-#: src/net/manaserv/loginhandler.cpp:249
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
-msgid "Client version is too old."
-msgstr "Du har en för gammal version av klienten"
-
-#: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Felaktigt användarnamn eller lösenord"
-
-#: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
-msgid "Account banned"
-msgstr "Konto raderat"
-
-#: src/net/manaserv/loginhandler.cpp:287
-msgid "Login attempt too soon after previous attempt."
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Felaktigt användarnamn, lösenord eller epostadress"
-
-#: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
-msgid "Username already exists."
-msgstr "Användarnamnet finns redan"
-
-#: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
-msgid "Email address already exists."
-msgstr "Epostadressen finns redan"
-
-#: src/net/manaserv/loginhandler.cpp:324
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Anslöt dig till grupp."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s anslöt sig till gruppen."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s avvisade din inbjudan."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Accepterar byteshandelsförfrågningar."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerar byteshandelsförfrågningar."
-
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vill byteshandla med dig, accepterar du?"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Byteshandlar med %s"
-
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
-msgid "Trade canceled."
-msgstr "Byteshandel avbruten."
-
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
-msgid "Trade completed."
-msgstr "Byteshandel genomförd."
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr "Kunde inte sparka ut!"
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr "Klarade av att sparka ut!"
-
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Thanks for selling."
-msgstr "Tack för en god affär."
-
-#: src/net/tmwa/buysellhandler.cpp:135
-msgid "Unable to sell."
-msgstr "Kan inte sälja."
-
-#: src/net/tmwa/buysellhandler.cpp:138
-#, fuzzy
-msgid "Unable to sell while trading."
-msgstr "Kan inte sälja."
-
-#: src/net/tmwa/buysellhandler.cpp:141
-#, fuzzy
-msgid "Unable to sell unsellable item."
-msgstr "Kunde inte plocka upp."
-
-#: src/net/tmwa/charserverhandler.cpp:121
+#: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:125
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
-msgstr "Kan inte använda ID"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:128
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr "Okänt fel"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:174
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-#, fuzzy
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr "Fel magic_token"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:184
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:187
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:201
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Information"
+
+#: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr "Karaktär borttagen."
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr "Kunde inte ta bort karaktär."
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "Styrka:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "Smidighet:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "Hälsa:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "Intelligens:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "Skicklighet:"
+msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "Tur:"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:106
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:128
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:114
-#, fuzzy, c-format
+#: src/net/ea/chathandler.cpp:136
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
-#, fuzzy
+#: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr "Spelare"
+msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:342
-#, fuzzy
+#: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr "Spelare"
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "Chattkanaler stöds inte!"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr "Namn"
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:106
-#, fuzzy
+#: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr "Förfrågan om byteshandel"
-
-#: src/net/tmwa/generalhandler.cpp:107
-#, c-format
-msgid "Strength %+d"
-msgstr "Styrka %+d"
-
-#: src/net/tmwa/generalhandler.cpp:108
-#, c-format
-msgid "Agility %+d"
-msgstr "Smidighet %+d"
-
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Vitality %+d"
-msgstr "Livskraft %+d"
-
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligens %+d"
-
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Skicklighet %+d"
-
-#: src/net/tmwa/generalhandler.cpp:112
-#, c-format
-msgid "Luck %+d"
-msgstr "Tur %+d"
-
-#: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Behörighetskontroll misslyckades"
-
-#: src/net/tmwa/generalhandler.cpp:141
-#, fuzzy
-msgid "No servers available."
-msgstr "Ingen server är tillgänglig"
-
-#: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Någon annan försöker att använda det här kontot"
-
-#: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Det här kontot är redan inloggat"
-
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "Ett hastighetshack har upptäckts"
-
-#: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
-msgid "Duplicated login."
-msgstr "Dubbel inloggning"
-
-#: src/net/tmwa/generalhandler.cpp:157
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Okänt anslutningsfel"
-
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Got disconnected from server!"
-msgstr "Kopplades från servern!"
-
-#: src/net/tmwa/generalhandler.cpp:262
-msgid "Luck"
-msgstr "Tur"
-
-#: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
-msgid "Defense"
-msgstr "Försvar:"
-
-#: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
-msgid "M.Attack"
-msgstr "M. attack:"
-
-#: src/net/tmwa/generalhandler.cpp:267
-#, fuzzy
-msgid "M.Defense"
-msgstr "M. försvar:"
-
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy, no-c-format
-msgid "% Accuracy"
-msgstr "% Träffsäkerhet:"
-
-#: src/net/tmwa/generalhandler.cpp:271
-#, fuzzy, no-c-format
-msgid "% Evade"
-msgstr "% Kringgå:"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
-#, fuzzy, no-c-format
-msgid "% Critical"
-msgstr "Kritisk träff"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
-#, fuzzy
-msgid "Attack Delay"
-msgstr "Attack %+d"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
-#, fuzzy
-msgid "Walk Delay"
-msgstr "Attack %+d"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
-#, fuzzy
-msgid "Attack Range"
-msgstr "Monster slår spelare"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Visa den här hjälpen"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Bjud in en spelare till din grupp"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:79
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Lämna gruppen du är i"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80
-#, fuzzy
+#: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Sparka ut någon från din grupp"
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Kommando: /invite <spelare>"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Det här kommandot bjuder in <spelare> till din grupp."
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Kommando: /leave"
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:97
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Det här kommandot får spelaren att lämna gruppen."
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Gille skapat."
 
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Kunde inte skapa gille."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:122
+#: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:127
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "Okänt injudningssvar från %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
 msgid "Guild name: %s"
-msgstr "Gille"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
 msgid "Guild master: %s"
-msgstr "Gille"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:209
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
 msgid "Guild level: %d"
-msgstr "Nivå: %d"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:211
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:213
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
 msgid "Average level: %d"
-msgstr "Maxnivå"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Gille"
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "Gille skapat."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
 msgid "Guild castle: %s"
-msgstr "Gille skapat."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:436
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:441
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:446
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s är nu en medlem i din grupp."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:451
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:456
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "Okänt injudningssvar från %s."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:478
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr "Du har lämnat gruppen."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:492
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s har lämnat din grupp."
+msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:524
+#: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:538
-#, fuzzy, c-format
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s är nu en medlem i din grupp."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Bjud in en spelare till din grupp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > Lämna gruppen du är i"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Sparka ut någon från din grupp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "Det här kommandot bjuder in <spelare> till din grupp."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "Det här kommandot får spelaren att lämna gruppen."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "Kommando: /item <alternativ>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
-"Det här kommandot ändrar huruvida gruppen ska kunna plocka upp efter alla."
 
-#: src/net/tmwa/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<alternativ> kan vara antingen ”1”, ”yes” eller ”true” för att dela på "
-"upplocken inom gruppen (vem som helst inom gruppen kan direkt plocka upp "
-"efter alla gruppmedlemmar), eller ”0”, ”no” eller ”false” för att inte dela "
-"på upplocken."
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "Kommando: /item"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "Det här kommandot visar huruvida gruppen kan plocka upp efter alla."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "Kommando: /exp <alternativ>"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Det här kommandot ändrar hur erfarenhet fördelas inom gruppen."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<alternativ> kan vara antingen ”1”, ”yes” eller ”true” för att tillåta "
-"delning av erfarenhet, eller ”0”, ”no” eller ”false” för att inte dela på "
-"erfarenhet."
 
-#: src/net/tmwa/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "Kommando: /exp"
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "Det här kommandot visar om erfarenhet delas inom gruppen."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "Upplocksdelning aktiverad."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "Upplocksdelning avaktiverad."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "Upplocksdelning är inte möjligt."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:157
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Upplocksdelning aktiverad."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "Fördelning av erfarenhet aktiverad."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "Fördelning av erfarenhet inaktiverad."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "Fördelning av erfarenhet ej möjlig."
+msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:196
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "Fördelning av erfarenhet aktiverad."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:379
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "Kunde inte använda föremål."
+msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:531
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "Kan inte utrusta."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:93
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:99
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "Det nya lösenordet är för kort"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Oregistrerat ID"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Fel lösenord"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "Konto raderat"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "Nekad tillträde till servern"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:176
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har permanent blivit bannlyst från spelet. Kontakta en GM."
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:180
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Du har en för gammal version av klienten"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:183
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Du har tillfälligt blivit utkastat från spelet till %s.\n"
-"Var vänlig kontakta en GM i forumet."
 
-#: src/net/tmwa/loginhandler.cpp:190
+#: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:193
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr "Det här användarnamnet finns redan"
+msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:199
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr "Användarnamnet finns redan"
-
-#: src/net/tmwa/network.cpp:152
-msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "Kan inte sälja."
-
-#: src/net/tmwa/network.cpp:426
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Ansluter till kartservern..."
-
-#: src/net/tmwa/partyhandler.cpp:86
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "Kunde inte skapa grupp."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:88
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "Grupp skapad."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s har lämnat din grupp."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s är redan medlem i en grupp."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s avvisade din inbjudan."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s är nu en medlem i din grupp."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:199
-#, fuzzy, c-format
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Okänt injudningssvar från %s."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:359
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "Du har lämnat gruppen."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s har lämnat din grupp."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "En okänd medlem försökte säga: %s"
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:529
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s är inte med i din grupp!"
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr "Du är död."
+
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr "Du är inte så värst levande längre."
+
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Liemannens svala händer sträcker sig efter din själ."
 
-#: src/net/tmwa/playerhandler.cpp:109
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr "Spelet är slut!"
+
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "Stoppa i mynt för att fortsätta."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
+"ställe."
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals"
+" misslyckades."
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr "Jag antar att det kunde gått bättre."
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr "Vill du att dina tillhörigheter ska identifieras?"
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr "Tillintetgjord."
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr "Verkar som att som att någon gav dig ditt huvud."
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
+"ny."
+
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "Du är inte död än. Du vilar bara."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "Du finns inte längre."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "Du har slutat att existera."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "Du är passé och har givit dig av för att träffa din skapare."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "Du är en steling."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "Berövad på ditt liv vilar du numera i frid."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
-"Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "Dina metaboliska processer är nu historia."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr "Du har trillat av pinn."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "Du har kastat in handduken."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "Du är en före detta spelare."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "Du har gått till de sälla jaktmarkerna."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "Meddelande"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:353
-#, fuzzy
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:458
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "Du plockade upp "
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:464
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
 msgid "You spent %s."
-msgstr "Du får %s."
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:509
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
-msgstr "Utrusta dig med pilar först."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Byteshandel misslyckades!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Kan inte visa smiley!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Kan inte sitta!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:167
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Kan inte skicka chattmeddelande!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:170
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "Kan inte ansluta till gruppen!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:173
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "Kan inte skrika!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Du har inte nått en tillräckligt hög nivå än!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Otillräckligt med HP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "Otillräckligt med SP!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "Du har inga anteckningar!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:199
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "Du kan inte göra det just nu!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "Verkar som att du behöver mer pengar… ;-)"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Du behöver en till röd juvel!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:212
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Du behöver en till blå juvel!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:215
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Du bär på för mycket för att kunna göra det här!"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:218
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Öh? Vad är det där?"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:229
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Kartförflyttning misslyckades..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:232
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "Kunde inte stjäla något..."
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:235
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "Giftet tog inte..."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vill byteshandla med dig, accepterar du?"
+
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:152
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Byteshandel avbröts av okänd anledning."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Byteshandel: du och %s"
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:174
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Byteshandel med %s avbruten."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:187
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
-msgstr "Ett okänt paket för att avbryta byteshandeln påträffades."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:255
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
-"sak flera gånger."
 
-#: src/net/tmwa/tradehandler.cpp:264
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "Kunde inte lägga till föremål av okänd anledning."
-
-#: src/playerrelations.cpp:414
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:434
-msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:481
-msgid "Floating bubble"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Byteshandel avbruten."
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
-#: src/resources/monsterdb.cpp:84
-msgid "unnamed"
-msgstr "namnlös"
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Byteshandel genomförd."
 
-#: src/resources/itemdb.cpp:62
-#, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Styrka"
 
-#: src/resources/itemdb.cpp:63
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "Defense %+d"
-msgstr "Försvar %+d"
+msgid "Strength %+.1f"
+msgstr ""
 
-#: src/resources/itemdb.cpp:64
-#, c-format
-msgid "HP %+d"
-msgstr "Hälsa %+d"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Smidighet"
 
-#: src/resources/itemdb.cpp:65
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "MP %+d"
-msgstr "Mana %+d"
-
-#: src/resources/itemdb.cpp:168
-msgid "Unknown item"
-msgstr "Okänt föremål"
-
-#, fuzzy
-#~ msgid "Level: "
-#~ msgstr "Nivå: %d"
-
-#, fuzzy
-#~ msgid "Exp: "
-#~ msgstr "EP:"
-
-#, fuzzy
-#~ msgid " Left: "
-#~ msgstr "Gå åt vänster"
-
-#, fuzzy
-#~ msgid "Map actors count: %d"
-#~ msgstr "Karaktärens värden okej"
-
-#, fuzzy
-#~ msgid "Smiles"
-#~ msgstr "Smiley"
-
-#, fuzzy
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Handla med %s@@"
-
-#, fuzzy
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Attackera %s@@"
-
-#, fuzzy
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@use|Använd@@"
-
-#, fuzzy
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@cancel|Avbryt@@"
-
-#, fuzzy
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@retrieve|Hämta@@"
-
-#, fuzzy
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Strunta i %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorera %s@@"
-
-#, fuzzy
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@use|Använd@@"
-
-#, fuzzy
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Sluta ignorera %s@@"
-
-#, fuzzy
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Ignorera %s fullständigt@@"
-
-#, fuzzy
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "/party > Bjud in en spelare till din grupp"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Sparka spelare@@"
-
-#, fuzzy
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@unignore|Sluta ignorera %s@@"
-
-#, fuzzy
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@use|Använd@@"
-
-#, fuzzy
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@attack|Attackera %s@@"
-
-#, fuzzy
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Sparka spelare@@"
-
-#, fuzzy
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Använd namn i chatt@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Avbryt@@"
-
-#, fuzzy
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Plocka upp %s@@"
-
-#, fuzzy
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Nämn i chattfönstret@@"
-
-#, fuzzy
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@use|Använd@@"
-
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Välj okej"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Hjälp --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Visa den här hjälpen"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Visa kartans namn"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Visa antalet inloggade spelare"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Säg något om dig själv"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Tömmer det här fönstret"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Skickar ett privat meddelande till en spelare"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Alias för msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Alias för msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr ""
-#~ "/query > Skapar en flik för privata meddelanden med en annan spelare"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Alias för query"
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Stänger viskningsfliken"
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Strunta i %s@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Visa alla offentliga chattkanaler"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Gå med i eller skapa en chattkanal"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Skapa ny grupp"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Skapa ny grupp"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Bjud in en spelare till din grupp"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Lista närvarande spelare (sänds till chattloggen om loggning "
-#~ "är aktiverad)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Globalt meddelande (endast för GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Stänger viskningsfliken"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Skickar ett privat meddelande till en spelare"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Skriv /help <kommando> för mer information."
-
-#~ msgid "Command: /help"
-#~ msgstr "Kommando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Kommando: /help <kommando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Det här kommandot ger mer information om <kommando>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Kommando: /announce <text>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** endast en GM kan använda det här kommandot ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Kommando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Det här kommandot tömmer chattloggen."
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Kommando: /item <alternativ>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Kommando: /join <chattkanal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Det här kommandot låter dig gå in i <chattkanal>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Om <chattkanal> inte existerar, skapas den."
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Det här kommandot visar en lista över alla chattkanaler."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Kommando: /me <meddelande>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Kommando: /msg <spelare> <meddelande>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Kommando: /whisper <spelare> <meddelande>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Kommando: /w <spelare> <meddelande>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Det här kommandot skickar <meddelande> till <spelare>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Kommando: /query <spelare>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Kommando: /q <spelare>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Det här kommandot försöker att skapa en flik för viskningar mellan dig "
-#~ "och <spelare>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Kommando: /w <spelare> <meddelande>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Kommando: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Det här kommandot sätter ämnet till <meddelande>."
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Kommando: /create <grupp>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Dessa kommandon skapar <grupp>."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Kommando: /create <grupp>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Dessa kommandon skapar <grupp>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Kommando: /party <spelare>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Kommando: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
-#~ "loggning av chatten är aktiverad skickas listan till loggfilen."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Kommando: /toggle <tillstånd>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller "
-#~ "om chattfönstret stänger sig själv."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<tillstånd> kan vara ”1”, ”yes” eller ”true” för att använda "
-#~ "returtangenten eller ”0”, ”no” eller ”false” för att använda automatisk "
-#~ "stängning."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Kommando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Det här kommandot visar tillståndet för huruvida retur används."
-
-#~ msgid "Command: /where"
-#~ msgstr "Kommando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-
-#~ msgid "Command: /who"
-#~ msgstr "Kommando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Skriv /help för en lista med kommandon."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Partikeldetaljer"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Omgivande FX"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Tangent för smiley %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Spelare slår monster"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Ämne: %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Namn: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Minikarta"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Påbörja loggning av chatten till en extern fil"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Kommando: /record <filnamn>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
-
-#~ msgid "Command: /record"
-#~ msgstr "Kommando: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Det här kommandot slutar loggning av chatten."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Närvaro loggades till fil."
-
-#~ msgid "Finishing recording."
-#~ msgstr "Avslutar chattloggning."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Loggar inte chattmeddelanden till fil."
-
-#~ msgid "Already recording."
-#~ msgstr "Loggar chattmeddelanden till fil."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Börjar logga chattmeddelanden…"
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Misslyckades att börja logga chattmeddelanden."
-
-#~ msgid "Recording..."
-#~ msgstr "Loggar chattmeddelanden…"
-
-#~ msgid "Stop recording"
-#~ msgstr "Sluta logga chattmeddelanden"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Gå till muspekaren"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "EP:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Pengar: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Jobb:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Nivå: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Grupp skapad."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Kunde inte viska eftersom ignorerad av spelaren."
-
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Konfigurationsfil att använda"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Konfigurationsfil att använda"
-
-#~ msgid "Sound"
-#~ msgstr "Ljud"
-
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Tillträde nekat"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Kunde inte välja karaktär av okänd anledning"
-
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr ""
-#~ "För tillfället är det inte möjligt att bjuda in något på det här viset."
-
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s har bjudit in dig till sin grupp."
-
-#~ msgid "Willpower:"
-#~ msgstr "Viljestyrka:"
-
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Byteshandlar med %s"
+msgid "Agility %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Viskning"
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Skicklighet"
 
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Lägg till %s som vän@@"
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Förbisedd"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Hälsa"
 
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Ignorera %s fullständigt@@"
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Bjud in %s till ditt gille@@"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligens"
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Bjud in %s till din grupp@@"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Prata med %s@@"
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Sparka monster@@"
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Plocka upp"
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Kan inte skicka ett tomt chattmeddelande!"
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
 
-#~ msgid "Unable to unequip."
-#~ msgstr "Kan inte avrusta."
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
 
-#~ msgid "Text Shadow"
-#~ msgstr "Textskugga"
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
 
-#~ msgid "Text Outline"
-#~ msgstr "Textkontur"
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Förloppsindikatoretiketter"
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Den är för dyr"
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Du har utrustat dig"
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
 
-#~ msgid "Player"
-#~ msgstr "Spelare"
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
 
-#~ msgid "Is"
-#~ msgstr "Är"
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#~ msgid "Logger"
-#~ msgstr "Loggning"
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Okänt föremålsslag"
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
 
-#~ msgid "Generics"
-#~ msgstr "Allmänna föremål"
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
 
-#~ msgid "Hats"
-#~ msgstr "Huvudbonader"
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
 
-#~ msgid "Usables"
-#~ msgstr "Förbrukningsvaror"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Ingen spelserver finns tillgänglig."
 
-#~ msgid "Shirts"
-#~ msgstr "Tröjor"
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr "Ämne: %s"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Enhandsvapen"
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
 
-#~ msgid "Pants"
-#~ msgstr "Byxor"
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
 
-#~ msgid "Shoes"
-#~ msgstr "Skor"
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Enhandsvapen"
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
 
-#~ msgid "Shields"
-#~ msgstr "Sköldar"
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
 
-#~ msgid "Rings"
-#~ msgstr "Ringar"
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#~ msgid "Necklaces"
-#~ msgstr "Halsband"
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#~ msgid "Arms"
-#~ msgstr "Handskar"
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#~ msgid "Ammo"
-#~ msgstr "Ammunition"
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
 
-#~ msgid "HP Bar"
-#~ msgstr "Full hälsostapel"
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Kunde inte skapa gille."
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "Trekvarts hälsostapel"
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Inbjudan skickad."
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "Halv hälsostapel"
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr "Medlem befordrad."
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "Kvarts hälsostapel"
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr "Kunde inte befordra medlem."
 
-#~ msgid "no"
-#~ msgstr "nej"
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Kompis"
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
 
-#~ msgid "Buddy List"
-#~ msgstr "Kompislista"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Beskrivning: %s"
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effekt: %s"
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Kontot är inte anslutet. Var god logga in först."
 
-#~ msgid "New"
-#~ msgstr "Ny"
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Jobbnivå: %d"
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
 
-#~ msgid "Present: "
-#~ msgstr "Närvarande: "
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
 
-#~ msgid "Quit Guild"
-#~ msgstr "Lämna gille"
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Okej"
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
 
-#~ msgid "Recent:"
-#~ msgstr "Senaste:"
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Använd testmagi 1"
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Använd testmagi 2"
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Använd testmagi 3"
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Tvåhandsvapen"
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Avrusta@@"
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Utrusta@@"
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Släpp@@"
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr "Anslöt dig till grupp."
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Dela@@"
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s anslöt sig till gruppen."
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Lager@@"
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
 
-#~ msgid "Select Server"
-#~ msgstr "Välj server"
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Accepterar byteshandelsförfrågningar."
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Kunde inte byta till "
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerar byteshandelsförfrågningar."
 
-#~ msgid "windowed"
-#~ msgstr "fönster"
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Byteshandlar med %s"
 
-#~ msgid "fullscreen"
-#~ msgstr "helskärms"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "Kunde inte sparka ut!"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Mystisk förmåga"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "Klarade av att sparka ut!"
 
-#~ msgid "Weapons"
-#~ msgstr "Vapen"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "Tack för en god affär."
 
-#~ msgid "Crafts"
-#~ msgstr "Hantverk"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "Kan inte sälja."
 
-#~ msgid "Stats"
-#~ msgstr "Statistik"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Totalt"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Kostnad"
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr "Styrka %+d"
 
-#~ msgid "Attack:"
-#~ msgstr "Attack:"
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr "Smidighet %+d"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflexer:"
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr "Livskraft %+d"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Återstående statuspoäng: %d"
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligens %+d"
 
-#~ msgid "curl error "
-#~ msgstr "curl-fel "
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Skicklighet %+d"
 
-#~ msgid " host: "
-#~ msgstr " värd: "
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "Tur %+d"
 
-#~ msgid "Buddys"
-#~ msgstr "Kompisar"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Party Window"
-#~ msgstr "Gruppfönster"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "Unarmed"
-#~ msgstr "Obeväpnad"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "Knife"
-#~ msgstr "Kniv"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Sword"
-#~ msgstr "Svärd"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "Stav"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "Piska"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "Båge"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "Kopplades från servern!"
 
-#~ msgid "Shooting"
-#~ msgstr "Skjutvapen"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Tur"
 
-#~ msgid "Mace"
-#~ msgstr "Spikklubba"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Axe"
-#~ msgstr "Yxa"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Craft"
-#~ msgstr "Hantverk"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Okänd förmåga"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " kan inte skapas och existerar inte! Avslutar."
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "Couldn't set "
-#~ msgstr "Kunde inte välja "
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid " video mode: "
-#~ msgstr " -videoläge: "
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Ansluter till karaktärsservern..."
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Ansluter till kontoservern..."
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias för /create"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Kommando: /new <grupp>"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Unnamed"
-#~ msgstr "Namnlös"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Plocka upp %s@@"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s är inte med i din grupp!"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Rullningsradie"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Tröghet för rullning"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Kan inte ladda selection.png"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Avbryt\n"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "namnlös"
 
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "Försvar %+d"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "NPC-textefterfrågan"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "Hälsa %+d"
 
-#~ msgid "NPC Number Request"
-#~ msgstr "NPC-nummerefterfrågan"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "Mana %+d"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "Okänt föremål"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default    : Kringgå inloggningsprocessen och använd "
-#~ "grundinställningarna"
 
-#~ msgid "Slots: "
-#~ msgstr "Utrymme: "
diff --git a/po/te.po b/po/te.po
index 6d05301fa..e9fd14906 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,2966 +1,4653 @@
-# Telugu translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-10-13 03:45+0000\n"
-"Last-Translator: వీవెన్ (Veeven) <Unknown>\n"
-"Language-Team: Telugu <te@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "ప్రవేశించు"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "సంకేతపదం:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- సహాయం--"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr ""
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr ""
-
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr ""
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr ""
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "మరింత సమాచారం కోసం,  /help <ఆదేశం> అని టైపు చెయ్యండి."
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr ""
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
+msgstr "గుర్తుతెలియని ఆదేశం."
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
+msgstr "సాధారణ"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/game.cpp:1577
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/beingpopup.cpp:118
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:132
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Guild: %s"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "సాధారణ"
-
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
-msgstr ""
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "పేరు"
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "గరిష్ఠ"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "ఈమెయిల్ చిరునామాని మార్చు"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "ఖాతా: %s"
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "సంకేతపదం:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "పేరు:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "వెంట్రుకల రంగు:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "వెంట్రుకల శైలి:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "సృష్టించు"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "పురుషుడు"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "స్త్రీ"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "ఈమెయిల్ చిరునామాని మార్చు"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "రంగులు"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "అవును"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "కాదు"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "పటం"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#, c-format
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:166
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Music: %s"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "పేరు: %s"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Minimap: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "ఖాతా: %s"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "వెల: %s / మొత్తం: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "సరే"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "సహాయం"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "బరువు:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "సరే"
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "అన్నీ"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "బరువు: "
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "ప్రవేశించు"
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "పటం"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "తదుపరి"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "తదుపరి"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "పంపించు"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "పాఠ్యం"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "పాఠ్యపు నీడ"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "నేపథ్యం"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "ఆటగాడు"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "చొక్కాలు"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "బూట్లు"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "ఉంగరాలు"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "ఈమెయిల్:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "రంగులు"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "రంగులు"
+msgid "This is what the color looks like"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "రకం: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "ఇంద్ర ధనస్సు"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "ఆటగాళ్ళు"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "పేరు"
+msgid "Show level"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "ఆటగాళ్ళు"
-
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "పాఠ్యం"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "గరిష్ఠ"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "నిండుతెర"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "కాదు"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "స్థాయి: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "స్థాయి: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "సృష్టించు"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "స్థాయి: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "స్థాయి: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "పేరు: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "ఆటగాడు"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "పేరు"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "తొలగించు"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "గుర్తుతెలియని ఆదేశం."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "సంకేతపదాన్ని మార్చు"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2968,631 +4655,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "no"
-#~ msgstr "కాదు"
-
-#~ msgid "Buddy"
-#~ msgstr "మిత్రుడు"
-
-#~ msgid "Buddy List"
-#~ msgstr "మిత్రుల జాబితా"
-
-#~ msgid "Description: %s"
-#~ msgstr "వివరణ: %s"
-
-#~ msgid "Previous"
-#~ msgstr "గత"
-
-#~ msgid "New"
-#~ msgstr "కొత్త"
-
-#~ msgid "Ok"
-#~ msgstr "సరే"
 
-#~ msgid "fullscreen"
-#~ msgstr "నిండుతెర"
diff --git a/po/th.po b/po/th.po
index 265629444..50eaf5cff 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,2965 +1,4645 @@
-# Thai translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-11-06 15:29+0000\n"
-"Last-Translator: Krit Marukawisutthigul <Unknown>\n"
-"Language-Team: Thai <th@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "กำลังเชื่อมต่อ..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "เข้าระบบ"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "รหัสผ่าน:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr ""
-
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr ""
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr ""
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr ""
-
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr ""
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr ""
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
+#: src/commandhandler.cpp:301
+msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/game.cpp:1577
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/gui/beingpopup.cpp:118
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr ""
-
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:132
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-
-#: src/game.cpp:172
-msgid "General"
+msgid "Guild: %s"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "เปลี่ยนที่อยู่ Email"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "บัญชี: %s"
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
+#: src/gui/changeemaildialog.cpp:132
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
+#: src/gui/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "ชื่อ:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "สีผม:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "ทรงผม:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "สร้าง"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "ชาย"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "หญิง"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "เปลี่ยนที่อยู่ Email"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "ใช่"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "ชื่อ: %s"
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Minimap: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:176
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
+#, c-format
 msgid "Particle count: %d"
-msgstr "บัญชี: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Particle detail: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Ambient FX: %s"
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "ทิ้ง"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr ""
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
-#: src/gui/login.cpp:60
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
-msgstr "ถัดไป"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "ถัดไป"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
+msgstr "ถัดไป"
+
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "กำลังเชื่อมต่อ..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:315
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "ไม่"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "เลเวล: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "เลเวล: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "สร้างตัวละคร"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "เลเวล: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr ""
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
 msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
-msgstr "Strength:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
-msgstr "Agility:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
-msgstr "Vitality:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
-msgstr "Intelligence:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
-msgstr "Dexterity:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "ชื่อ:"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "ลบทิ้ง"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "% Critical"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "เปลี่ยนรหัสผ่าน"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
-msgstr ""
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -2967,619 +4647,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Willpower:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "Description: %s"
-#~ msgstr "รายละเอียด: %s"
-
-#~ msgid "Previous"
-#~ msgstr "ก่อนหน้า"
-
-#~ msgid "New"
-#~ msgstr "สร้างใหม่"
 
-#~ msgid "Ok"
-#~ msgstr "ตกลง"
diff --git a/po/tr.po b/po/tr.po
index 3c5503599..fd3148eab 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,3024 +1,4645 @@
-# Turkish translation for mana
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-02-12 09:43+0000\n"
-"Last-Translator: Bekir AVCI <bilgi@turkuazyakit.com>\n"
-"Language-Team: Turkish <tr@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "Sunucu bekleniyor"
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "Oturum Aç"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "Şifre:"
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "Değiştir"
+msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "Hesabı Kapat"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- Yardım --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > Bu yardımı görüntüler"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "Harita adını gösterir"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > Çevirimiçi kullanıcı sayısını görüntüler"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > Hakkınızda birşey yazın"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > Bu pencereyi temizler"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Bir kullanıcıya özel mesaj gönder"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias of msg"
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > Alias of msg"
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Diğer kullanıcılarla özel mesajlar için bir sekme yaratır."
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > Bütün genel kanalları gösterir"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "Bir kanala katıl veya bir kanal oluştur"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "Guruba bir kullanıcı davet et."
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "Guruba bir kullanıcı davet et."
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "Yazışmayı bir dış dosyaya kaydet."
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "Genel duyuru (yalnız GM)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "Daha fazla bilgi için ,yardım/yaz <komut>."
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Komut: /yardım"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Bu komut kullanılabilir bütün komutların bir  listesini gösterir."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "Komut: /help <command>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "Bu komut  <komut> hakkında yardımı gösterir."
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Komut: / duyuru <msg>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** Sadece GM  için  mevcut ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Bu komut şuanda çevirimiçi olan bütün oyunculara mesaj <msg> gönderir."
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Komut : /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "Bu komut önceki yazışma girdilerini siler."
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Komut: /join <channel>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "Komut: /join <channel>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "Komut: /list"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr "Sohbeti kapatır."
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "Komut: /me <message>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "Komut: /msg <nick> <message>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "Komut: /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "Komut: /w <nick> <message>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "Komut: /query <nick>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "Komut: /q <nick>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Komut: /party <nick>"
-
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "Komut: /party <nick>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Bu komut <nick> adlı kişiyi partinize davet eder."
-
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "Komut: /present"
-
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "Komut: /record <filename>"
-
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "Komut: /record"
-
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "Komut: /toggle <state>"
-
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "Komut: /toggle"
-
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Komut: / duyuru <msg>"
-
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "Komut:  /where"
-
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "Bu komut geçerli haritanın adını gösterir."
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "Komut:  /who"
-
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
-
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "Komutların bir listesi için /help yazın."
-
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:970
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "Sohbeti kapatır."
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "Ekran Görüntüsü"
+msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "Sunucu bağlantısı koptu,Program şimdi kapatılacak"
+msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "Harita yüklenemedi"
+msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "Parti"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "İsim"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "Saldırı"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "Konuş"
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "Satın al"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "En Fazla"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "Mağaza"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Satış"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "Hesab:% s"
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Adınızda en az 4 karakter gerekir."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Adınızda en az 4 karakter gerekir."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Şifre Değiştir"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Şifre:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Adınızda en az 4 karakter gerekir."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Adınızda en az 4 karakter gerekir."
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Karakter oluşturma"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "İsim:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "Saç Rengi:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "Saç Stili:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "Oluştur"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Erkek"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kadın"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter gerekir."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "Karakter İstatistik Tamam"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Bu karakteri silmek istediğinize emin misiniz?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "Hesap ve Karakter Yönetimi"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Hesabı Kapat"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "Değiştir"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Sil"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "Kapat"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "Evet"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "Hayır"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "Harita"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Music: %s"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "İsim: %s"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Minimap: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Hesab:% s"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Fiyat: %s / Toplam: %s"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Kapat"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "Tamam"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ekipman"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "Yardım"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "Kapat"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Envanter"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "Donatmak"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "Kullan"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "Bölme"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "Ağırlık:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
+msgstr "Depo"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr "Almak"
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "Tamam"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "Hepsi"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "Ağırlık: "
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Oturum Aç"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Sunucu:"
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "Kullanıcı adını hatırla"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Üye ol"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "Sunucu"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Harita"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "Sunucu bekleniyor"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Sıfırla"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Sonraki"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Alıcı:"
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "Gönder"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:87
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Metin"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Metin Gölgesi"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "Ticaret"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Metin Anahat"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
+msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Arka plan"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Öğe çok pahalı"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Öğe bulunuyor"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Oyuncu"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Parti"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Birlik"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Sunucu"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Diğer oyuncuların isimleri"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM isimleri"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Canavarlar"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Bilinmeyen Öğe Türü"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Jenerik"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Şapkalar"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Gömlek"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Ayakkabılar"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Kalkanlar"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Yüzükler"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Kolye"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Silah"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritik Hit"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Saldırı"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "Canavarlar"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "Depo"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "Almak"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Geçiş sunucusu"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:58
 msgid "Switch character"
 msgstr "Geçiş karakteri"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr ""
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr ""
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr ""
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Kayıt başlatılıyor ..."
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Kayıt başlatılamadı."
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Kaydediliyor..."
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Kaydı durdur"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "Onayla:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "E-Posta:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "Sunucu Seçin"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Sunucu:"
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "Sunucu:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "Bağlanıyor..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "Sunucu"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "Sunucu bekleniyor"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ses"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "Ses"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "SFX ses"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "Müzik ses seviyesi"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "Metin yok"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Renkler"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "Renkler"
+msgid "This is what the color looks like"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "Türü: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Sabit"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Darbe"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "Başlat"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "Kırmızı: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "Yeşil: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "Mavi: "
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Uygula"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrasyon"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Dur"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "Klavye"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "Atamak"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "Varsayılan"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Canavarlar"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Oyuncular"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "İsim"
+msgid "Show level"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "Arkadaş"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-#, fuzzy
-msgid "Show gender"
-msgstr "Adı göster"
-
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "Oyuncular"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "Küçük"
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "Normal"
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "Yazı tipi boyutu"
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "Büyük"
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Metin yok"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "Metin"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "kapalı"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "düşük"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "yüksek"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "orta"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tam ekran"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "Adı göster"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "sohbet"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS Limit:"
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "Adı göster"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "Yazı tipi boyutu"
-
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "Hayır"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatılması gerekli."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak yeniden başlatma gerektirir."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Ekran çözünürlüğü değiştirildi"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "Ekle"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "Beceriler"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Seviye: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Seviye: %d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr "Birlik"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "Birlik oluşturma"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Çıkmak istediğinize emin misiniz?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "Guruba bir kullanıcı davet et."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "Guruba bir kullanıcı davet et."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Çıkmak istediğinize emin misiniz?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "Birlik oluşturma"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "Karakter oluşturma"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "Büyük"
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "Birlik"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "Sunucu Seçin"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "Parti"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "Sunucu Seçin"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr "İş:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Para: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "İş:"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Karakter İstatistik Tamam"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Seviye: %d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "Ticaret"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "Ekle"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Değiştir"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Yeterli para yok."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "İsim: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "Başlat"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "Diğer oyuncuların isimleri"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM isimleri"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCs"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "Kritik Hit"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "Komut: /users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "Komut: /topic <message>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "Komut: /quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "Komut: /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "Komut: /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "Komut: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "Komut:  /where"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "Durum"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "Kısayol"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "Sunucu Seç"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "Değiştir"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "Sunucu Seçin"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "Aşağı Taşı"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "Sola Taşı"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "Saldırı"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Konuş"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Hedef Oyuncu"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "Sohbet Penceresi"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "Durum penceresi"
+msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "Durum penceresi"
+msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/help > Bu yardımı görüntüler"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "Oyuncu"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "İsim"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Dexterity %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:136
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "Güçlülük"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "Çeviklik"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "yaşama gücü"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "Istihbarat"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "Maharet"
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "Şans"
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Savunma:"
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "Saldırı"
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "Savunma:"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Accuracy"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/ea/guildhandler.cpp:182
 #, c-format
-msgid "% Evade"
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "Kritik Hit"
-
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "Guruba bir kullanıcı davet et."
-
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Bu komut <nick> adlı kişiyi partinize davet eder."
-
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Bu komut geçerli haritanın adını gösterir."
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "Bilinmeyen komut."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "Hesabı Kapat"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "Şifre Değiştir"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3026,674 +4647,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Güçlülük"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Çeviklik"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Maharet"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "yaşama gücü"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Istihbarat"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "Karakter İstatistik Tamam"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "Karakter İstatistik Tamam"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Bilinmeyen komut."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "Komut: /join <channel>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "Bilinmeyen komut."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "Tamamlandı"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
+msgid "Strength %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
+msgid "Agility %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
+msgid "Intelligence %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "isimsiz"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "no"
-#~ msgstr "hayır"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Buddy"
-#~ msgstr "Arkadaş"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "Şans"
 
-#~ msgid "Buddy List"
-#~ msgstr "Arkadaş Listesi"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "Açıklama: %s"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Effect: %s"
-#~ msgstr "Etkisi:% s"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Önceki"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "Yeni"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Iş Düzeyi:% d"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Tamam"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
 
-#~ msgid "Magic"
-#~ msgstr "Büyü"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "windowed"
-#~ msgstr "pencereli"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "fullscreen"
-#~ msgstr "tam ekran"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Weapons"
-#~ msgstr "Silahlar"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Crafts"
-#~ msgstr "El sanatları"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "isimsiz"
 
-#~ msgid "Stats"
-#~ msgstr "Istatistikler"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "Toplam"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "Maliyet"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr ""
 
-#~ msgid "Attack:"
-#~ msgstr "Saldırı:"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "Refleks %:"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Kalan Durum Puanı:% d"
 
-#~ msgid "Unnamed"
-#~ msgstr "İsimsiz"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e8e52e5a6..779f21790 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,2967 +1,4539 @@
-# Simplified Chinese translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
 #
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-# Hong Hao <oahong@gmail.com>, 2009.
+#   <colorfullife81@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-05 23:49+0000\n"
-"Last-Translator: luojie-dune <Unknown>\n"
-"Language-Team: Chinese Simplified <themanaworld-devel@lists.sourceforge."
-"net>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
+"team/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: China\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr "在地图上可见"
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr "躲闪"
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr "小姐"
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr "A"
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr "I"
+
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:909
 msgid "Connecting to server"
-msgstr "正在连接 地图 服务器..."
+msgstr "连接到服务器"
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:683
+#: src/client.cpp:973
 msgid "Entering game world"
-msgstr ""
+msgstr "进入游戏世界"
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1073
 msgid "Requesting characters"
-msgstr "选择角色"
+msgstr "请求字符"
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
-msgstr "正在连接 地图 服务器..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr "连接到游戏服务器"
+
+#: src/client.cpp:1114
+msgid "Changing game servers"
+msgstr "更改游戏服务器"
+
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:815
+#: src/client.cpp:1167
 msgid "Requesting registration details"
-msgstr ""
+msgstr "申请登记的详细信息"
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1194
 msgid "Password Change"
-msgstr "密码："
+msgstr "密码更改"
 
-#: src/client.cpp:843
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "密码成功！"
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email Change"
-msgstr "改变"
+msgstr "电子邮件变更"
 
-#: src/client.cpp:863
-#, fuzzy
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
-msgstr "会员晋升成功。"
+msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1235
 msgid "Unregister Successful"
-msgstr "注销"
+msgstr "注销成功"
 
-#: src/client.cpp:884
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
-#, fuzzy, c-format
+#: src/client.cpp:1628
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "无效的更新主机： "
+msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1689
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- 帮助 --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > 显示此帮助"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > 显示地图名"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > 显示在线用户数"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > 自我介绍"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > 清除此窗口"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > 发送私人信息给用户"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > msg的别名"
+#: src/commandhandler.cpp:415
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > msg的别名"
+#: src/commandhandler.cpp:435
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > 为和其他用户之间的私密信息开启一个新的标签页"
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > query的别名"
+#: src/commandhandler.cpp:462
+msgid "Guild name is missing."
+msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+msgid "Please specify a name."
+msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:516
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > 显示所有公共频道"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > 加入或者创建一个新的频道"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > 创建一个新的帮会"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "邀请一个用户加入队伍"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > 开始记录聊天至外部文件"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > 确定<回车>键是否切换聊天日志"
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > 获取列席的玩家列表（若开启logging，则发送到聊天日志）"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > 全局通告（限GM使用）"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "输入 /help <命令>，获取更多信息。"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "命令： /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "该命令可显示所有可用命令。"
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "命令： /help <命令>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "该命令显现<命令>的帮助信息"
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "命令： /announce <信息>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "该命令会发送<信息>给所有在线用户。"
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "命令： /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "该命令可清除历史聊天记录。"
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "命令：/item <策略>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "命令：/join <频道>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "该命令让您进入<频道>。"
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "如果<频道>不存在，自动创建。"
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "命令：/list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "改命令列出所有频道列表。"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "命令：/me <信息>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "该命令告诉别人你正在（做）<信息>。"
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "命令：/msg <昵称><信息>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "命令：/whisper <昵称><信息>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "命令：/w <昵称><信息>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "该命令发送文本<信息>给<昵称>。"
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "命令：/query <昵称>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "命令：/q <昵称>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "该命令尝试为您和<昵称>之间的密语开启一个新的标签。"
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "命令：/create <帮会名>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "这些命令创建一个被称为<帮会名>的新帮会。"
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "命令：/party <昵称>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "该命令邀请<昵称>和你聚会。"
+#: src/commandhandler.cpp:516
+msgid "Message closes chat."
+msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "命令： /present"
+#: src/commandhandler.cpp:527
+msgid "Return now toggles chat."
+msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr "该命令得到列席的玩家名单并传送到记录日志如果记录，否则聊天记录。"
+#: src/commandhandler.cpp:533
+msgid "Message now closes chat."
+msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "命令： /record <文件名>"
+#: src/commandhandler.cpp:561
+msgid "friend"
+msgstr "朋友"
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+#: src/commandhandler.cpp:566
+msgid "disregarded"
+msgstr "无视"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "命令: /record"
+#: src/commandhandler.cpp:571
+msgid "neutral"
+msgstr "中性"
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "此命令结束将此会话记录"
+#: src/commandhandler.cpp:590
+#, c-format
+msgid "Player already %s!"
+msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "命令: /toggle <状态>"
+#: src/commandhandler.cpp:604
+#, c-format
+msgid "Player successfully %s!"
+msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr "该命令设置回车键是否切换聊天日志，或者聊天日志功能是否自动关闭。"
+#: src/commandhandler.cpp:612
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
-msgstr "<状态> 可用“1”、“yes”、“true”来开启，或以“0”、“no”、“false”关闭。"
+#: src/commandhandler.cpp:634
+msgid "Player wasn't ignored!"
+msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "命令: /toggle"
+#: src/commandhandler.cpp:641
+msgid "Player no longer ignored!"
+msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "该命令显示<回车>键切换状态"
+#: src/commandhandler.cpp:643
+msgid "Player could not be unignored!"
+msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "命令：/item <策略>"
+#: src/commandhandler.cpp:660
+msgid "Player already erased!"
+msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:671
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "命令: /where"
-
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "该条命令显示当前地图名。"
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "命令： /who"
-
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "该条命令可显现当前在线用户总数。"
+#: src/commandhandler.cpp:673
+msgid "Player could not be erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "输入 /help 获取命令列表。"
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "无法发送空白密语！"
+#: src/commandhandler.cpp:982
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:991
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:999
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "请求加入频道%s。"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "帮会名称缺失。"
+#: src/commandhandler.cpp:1007
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
+#: src/commandhandler.cpp:1015
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/commandhandler.cpp:1094
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "讯息关闭聊天。"
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "<回车>键现在切换聊天。"
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "讯息现在关闭聊天。"
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1106
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "帮会创建成功。"
+#: src/commandhandler.cpp:1110
+msgid "Created:"
+msgstr "创建于："
 
-#: src/commandhandler.cpp:486
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/commandhandler.cpp:1112
+msgid "Deleted:"
+msgstr "删除："
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "密语无法发送，你已被用户忽略。"
-
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+msgid "Debug"
+msgstr "调试 "
+
+#: src/game.cpp:488
 msgid "Screenshot saved as "
-msgstr "屏幕快照保存至 ~/"
+msgstr "截图保存为"
 
-#: src/game.cpp:331
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
-msgstr "与服务器连接丢失,程序将会退出."
+msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:360
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:705
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:712
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
-msgstr "无法加载地图"
+msgstr "不能加载地图"
 
-#: src/game.cpp:947
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:124
+#, c-format
 msgid "Party: %s"
-msgstr "帮会（%s）"
+msgstr "团队:%s"
+
+#: src/gui/beingpopup.cpp:138
+#, c-format
+msgid "Guild: %s"
+msgstr "工会:%s"
+
+#: src/gui/beingpopup.cpp:151
+#, c-format
+msgid "Pvp rank: %d"
+msgstr "Pvp等级: %d"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/beingpopup.cpp:162
+#, c-format
+msgid "Comment: %s"
+msgstr "评论: %s"
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr "机器人检查"
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "姓名"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "攻击"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "说话"
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+msgid "Move"
+msgstr "移动"
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr "结果"
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "重置"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
-msgstr ""
+msgstr "-"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "更换Email地址"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "帐号：%s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "输入新Email地址两次:"
+msgstr "两次新的电子邮件地址："
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符。"
+msgstr "新的电子邮件地址，需要至少%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "用户名不能少于%d个字符"
+msgstr "新的电子邮件地址必须小于%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:141
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "新电子邮件地址已经存在。"
+msgstr "电子邮件地址不匹配。"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "输入新密码两次:"
+msgstr "输入两次新密码："
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "先输入旧密码。"
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "密码需要至少%d个字符"
+msgstr "新密码需要至少%d个字符长。"
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符。"
+msgstr "新密码必须小于%d个字符长。"
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "新的密码输入不匹配。"
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "发色："
+msgstr "头发颜色："
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "帐号和角色管理"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr ""
+msgstr "登录"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "更换Email地址"
+msgstr "变更电子邮件"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr "不正确的密码"
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr "删除字符输入的密码"
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr "输入密码："
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "关闭"
+msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr "等级 %d"
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
-msgstr ""
+msgstr "()"
+
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr "默认"
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr "黑色"
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr "红色"
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr "绿色"
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr "蓝色"
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr "金"
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr "黄色"
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr "粉红色"
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr "紫"
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr "灰色"
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr "棕色"
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr "彩虹1"
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr "彩虹2"
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr "彩虹3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "？？？"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:606
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d 玩家出席。"
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "否"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
+msgid "Ignore"
+msgstr "忽略"
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:64
+msgid "Map"
+msgstr "地图"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr "音乐："
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr "地图："
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr "小地图："
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr "光标："
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr "的位置："
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr "地图演员数："
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#, c-format
+msgid "%d FPS (Software)"
+msgstr "%d FPS (软件)"
+
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr "%d的FPS (快速 OpenGL)"
+
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr "%d FPS (旧的OpenGL)"
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
+msgstr "%d的FPS"
+
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "主题：%s"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
+msgstr "粒子数：%d个"
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr "目标："
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr "目标ID："
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr "目标水平："
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr "目标："
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr "目标公会："
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr "攻击延迟："
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "姓名：%s"
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "小地图"
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "粒子效果"
+#: src/gui/debugwindow.cpp:393
+#, c-format
+msgid "In: %d bytes/s"
+msgstr "输入:%d 字节/"
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "纹理细节"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "环境音效"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr "你知道吗？"
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "关闭"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr "<上一页"
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr "下一页>"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr "自动打开这个窗口"
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "确定"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "关闭"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr "槽："
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr "过滤器："
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr "排序："
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr "na"
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr "az"
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr "id"
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
-msgstr "丢弃"
+msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "槽："
+msgstr "装具"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+msgid "Store"
+msgstr "存储"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+msgid "Retrieve"
+msgstr "取回"
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "确定"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr "未知。"
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ","
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "重量： "
+msgstr "重量：%s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr "杀敌统计"
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr "复位统计"
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr "复位定时器"
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr "等级:%d 在 %f%%"
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr "最后EXP："
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr "%s %d?"
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr "正常"
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr "自动关闭"
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr "跳过"
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr "自定义更新主机"
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "保存用户名"
+msgstr "记住用户名"
+
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr "更新日期："
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "服务器"
+msgstr "更改服务器"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "地图"
+#: src/gui/ministatuswindow.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:65
+msgid "mana bar"
+msgstr "法力栏"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatuswindow.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:92
+msgid "weight bar"
+msgstr "重量栏"
+
+#: src/gui/ministatuswindow.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:98
+msgid "money bar"
+msgstr "钱栏"
+
+#: src/gui/ministatuswindow.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:104
+msgid "status bar"
+msgstr "状态栏"
+
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
+msgid "Need"
+msgstr "需要"
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "等待服务器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "提交"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "重置"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+msgid "Clear"
+msgstr "清除"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "下一个"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "至："
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "发送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "卸下装备"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文本"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文本阴影"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文本轮廓"
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "交易"
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "进度条标签"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+msgid "Whisper"
+msgstr "密语"
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+msgid "Heal"
+msgstr "愈合"
+
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
+msgid "Be friend"
+msgstr "是朋友"
+
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "突出显示"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "标签加亮"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太昂贵"
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr "完全忽略"
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已装备"
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
+msgid "Follow"
+msgstr "按照"
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
+msgid "Kick from party"
+msgstr "踢从党"
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
+msgid "Kick from guild"
+msgstr "踢从公会"
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "服务器"
+#: src/gui/popupmenu.cpp:242
+msgid "Kick player"
+msgstr "踢球员"
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "记录器"
+#: src/gui/popupmenu.cpp:244
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超链接"
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+msgid "Show Items"
+msgstr "显示项目"
 
-# need more contents!!!
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "存在"
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他玩家名"
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
+msgid "Add comment"
+msgstr "发表评论"
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "自己的名字"
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
+msgid "Buy (?)"
+msgstr "购买(?)"
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
+msgid "Sell (?)"
+msgstr "出售(?)"
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/popupmenu.cpp:298
+msgid "Kick"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
+#: src/gui/popupmenu.cpp:309
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "未知物品类型"
+#: src/gui/popupmenu.cpp:315
+msgid "Add to priority attack list"
+msgstr "优先攻击列表"
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般的"
+#: src/gui/popupmenu.cpp:317
+msgid "Add to attack list"
+msgstr "加入攻击清单"
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
+#: src/gui/popupmenu.cpp:320
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可用的"
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "衬衫"
+#: src/gui/popupmenu.cpp:483
+msgid "Pick up"
+msgstr "拾取"
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+msgid "Add to chat"
+msgstr "加入聊天"
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "裤子"
+#: src/gui/popupmenu.cpp:501
+msgid "Map Item"
+msgstr "地图项"
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
+#: src/gui/popupmenu.cpp:502
+msgid "Rename"
+msgstr "重命名"
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾"
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "指环"
+#: src/gui/popupmenu.cpp:522
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "项链"
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr "法术"
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
+#: src/gui/popupmenu.cpp:540
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "弹药"
+#: src/gui/popupmenu.cpp:541
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/popupmenu.cpp:567
+msgid "Disable highlight"
+msgstr "禁用"
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "拾起通知"
+#: src/gui/popupmenu.cpp:572
+msgid "Enable highlight"
+msgstr "启用突出"
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "到期通知"
+#: src/gui/popupmenu.cpp:577
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻击怪兽"
+#: src/gui/popupmenu.cpp:582
+msgid "Remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪兽击打玩家"
+#: src/gui/popupmenu.cpp:587
+msgid "Enable away"
+msgstr "启用远"
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "会心一击"
+#: src/gui/popupmenu.cpp:592
+msgid "Disable away"
+msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失误"
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+msgid "Leave"
+msgstr "留下"
+
+#: src/gui/popupmenu.cpp:758
+msgid "Change guild position"
+msgstr "更改公会的立场"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Rename map sign          "
+msgstr "重命名的地图标志"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Name:                    "
+msgstr "名称："
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1241
+msgid "Player comment            "
+msgstr "玩家评论"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1243
+msgid "Comment:                      "
+msgstr "评论："
+
+#: src/gui/popupmenu.cpp:1607
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP条"
+#: src/gui/popupmenu.cpp:1613
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP条"
+#: src/gui/popupmenu.cpp:1616
+msgid "Add to trade half"
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP条"
+#: src/gui/popupmenu.cpp:1618
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP条"
+#: src/gui/popupmenu.cpp:1630
+msgid "Store 10"
+msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "与%s交易中"
+#: src/gui/popupmenu.cpp:1633
+msgid "Store half"
+msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "攻击 %+d"
+#: src/gui/popupmenu.cpp:1635
+msgid "Store all"
+msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
+msgid "Drop all"
+msgstr "所有"
 
-#: src/gui/popupmenu.cpp:101
-#, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|和%s成为朋友@@"
+#: src/gui/popupmenu.cpp:1674
+msgid "Retrieve 10"
+msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:106
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "被忽视的"
+#: src/gui/popupmenu.cpp:1677
+msgid "Retrieve half"
+msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "忽略"
+#: src/gui/popupmenu.cpp:1679
+msgid "Retrieve all"
+msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|完全忽略%s@@"
-
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1809
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|邀请%s加入你的工会@@"
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+msgid "Hide"
+msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|邀请%s加入你的帮会@@"
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+msgid "Show"
+msgstr "显示"
 
-#: src/gui/popupmenu.cpp:144
-#, fuzzy
-msgid "Kick player"
-msgstr "踢出失败！"
-
-#: src/gui/popupmenu.cpp:153
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|和%s交谈@@"
-
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|踢掉怪物@@"
-
-#: src/gui/popupmenu.cpp:174
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|添加姓名至聊天@@"
+#: src/gui/popupmenu.cpp:1883
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "捡起"
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+msgid "Copy to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|添加到聊天@@"
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "存储"
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+msgid "Move up"
+msgstr "x"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+msgid "Move down"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:56
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "交换角色"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "结束录制。"
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "不在当前录制中。"
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "已经录制中。"
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "开始录制……"
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "开始录制失败。"
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "录制中……"
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "停止录制"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "确认："
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "电子邮件"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
-msgstr "选择你的服务器"
+msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "服务器："
+#: src/gui/serverdialog.cpp:242
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:251
+msgid "Use same ip for game sub servers"
+msgstr "游戏分服务器使用相同的IP"
+
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
-msgstr "服务器："
+msgstr "服务器类型："
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:289
+msgid "Load"
+msgstr "负载"
+
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
-msgstr "连接中..."
+msgstr "连接"
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
-msgstr "自定义鼠标"
+msgstr "自定义服务器"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
-msgstr "等待服务器中"
+msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
-msgstr ""
+msgstr "准备下载"
+
+#: src/gui/serverdialog.cpp:567
+msgid "Error retreiving server list!"
+msgstr "错误retreiving的服务器列表！"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "声音"
+#: src/gui/serverdialog.cpp:672
+msgid "requires a newer version"
+msgstr "需要较新版本"
+
+#: src/gui/serverdialog.cpp:674
+#, c-format
+msgid "requires v%s"
+msgstr "需要 v%s"
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr "启用音频"
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr "启用游戏SFX"
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr "启用GUI SFX"
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr "启用音乐"
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr "启用语音聊天"
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "下载音乐"
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "无文本"
+msgstr "公告"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "如果你想下载新音乐,您必须重新启动您的客!"
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
+msgstr "声音引擎"
+
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "颜色"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr "从收到的聊天消息中删除颜色"
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "显示聊天颜色列表"
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr "命令"
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "允许在所有聊天标签中使用魔法和GM命令"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr "限制"
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "这就是该色彩看起来的样子"
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr "限制聊天的最大"
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr "日志"
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "启用聊天记录"
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr "显示聊天记录"
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr "消息"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "隐藏商店的消息"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr "标签"
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "将所有密语放于标签夜"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr "在调试选项卡中显示服务器的消息"
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr "标签"
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr "启用战斗“选项卡"
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr "显示的战斗事件"
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr "时间"
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
+msgstr "使用本地时间"
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "颜色"
+msgid "This is what the color looks like"
+msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "类型： "
+msgstr "类型:"
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "显示： "
+msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "红： "
+msgstr "红色："
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "绿： "
+msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "蓝： "
+msgstr "蓝色："
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr "阿尔法："
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "键盘"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr "取消分配"
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
+#: src/gui/setup_other.cpp:39
+msgid "Misc"
+msgstr "杂项"
+
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "怪物"
+
+#: src/gui/setup_other.cpp:47
+msgid "Show damage inflicted to monsters"
+msgstr "显示损坏造成的，以怪物"
+
+#: src/gui/setup_other.cpp:50
+msgid "Auto target only reachable monsters"
+msgstr "自动目标只有到达怪物"
+
+#: src/gui/setup_other.cpp:53
+msgid "Highlight monster attack range"
+msgstr "突出显示怪物的攻击范围"
+
+#: src/gui/setup_other.cpp:57
+msgid "Show monster hp bar"
+msgstr "显示怪物HP栏"
+
+#: src/gui/setup_other.cpp:60
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:66
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:69
+msgid "Highlight map portals"
+msgstr "突出显示的地图门户网站"
+
+#: src/gui/setup_other.cpp:72
+msgid "Highlight floor items"
+msgstr "突出地板项目"
+
+#: src/gui/setup_other.cpp:75
+msgid "Highlight player attack range"
+msgstr "突出显示球员的攻击范围"
+
+#: src/gui/setup_other.cpp:78
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:81
+msgid "Draw path"
+msgstr "绘制路径"
+
+#: src/gui/setup_other.cpp:84
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:88
+msgid "Moving"
+msgstr "移动"
+
+#: src/gui/setup_other.cpp:90
+msgid "Auto fix position"
+msgstr "自动修复的位置"
+
+#: src/gui/setup_other.cpp:93
+msgid "Attack while moving"
+msgstr "攻击的同时移动"
+
+#: src/gui/setup_other.cpp:96
+msgid "Sync player move"
+msgstr "同步播放移动"
+
+#: src/gui/setup_other.cpp:99
+msgid "Crazy move A program"
+msgstr "疯狂的举动的程序"
+
+#: src/gui/setup_other.cpp:103
+msgid "Player"
+msgstr "玩家"
+
+#: src/gui/setup_other.cpp:105
+msgid "Show own hp bar"
+msgstr "显示自己的HP栏"
+
+#: src/gui/setup_other.cpp:108
+msgid "Enable quick stats"
+msgstr "启用快速统计"
+
+#: src/gui/setup_other.cpp:111
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
+msgid "Show job exp messages"
+msgstr "显示工作EXP消息"
+
+#: src/gui/setup_other.cpp:117
+msgid "Show players popups"
+msgstr "显示球员弹出窗口"
+
+#: src/gui/setup_other.cpp:120
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:123
+msgid "Show job"
+msgstr "显示工作"
+
+#: src/gui/setup_other.cpp:126
+msgid "Enable attack filter"
+msgstr "启用攻击过滤器"
+
+#: src/gui/setup_other.cpp:129
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:135
+msgid "Accept sell/buy requests"
+msgstr "接受出售/购买请求"
+
+#: src/gui/setup_other.cpp:138
+msgid "Enable shop mode"
+msgstr "启用店模式"
+
+#: src/gui/setup_other.cpp:144
+msgid "Log NPC dialogue"
+msgstr "NPC对话"
+
+#: src/gui/setup_other.cpp:148
+msgid "Other"
+msgstr "其他"
+
+#: src/gui/setup_other.cpp:150
+msgid "Enable server side attack"
+msgstr "启用服务器端的攻击"
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable bot checker"
+msgstr "启用BOT检查"
+
+#: src/gui/setup_other.cpp:156
+msgid "Enable buggy servers protection"
+msgstr "启用BUG保护"
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable debug log"
+msgstr "启用调试日志"
+
+#: src/gui/setup_other.cpp:162
+msgid "Low traffic mode"
+msgstr "低流量模式"
+
+#: src/gui/setup_other.cpp:165
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:168
+msgid "Show background"
+msgstr "显示背景"
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Perfomance"
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "自动调整"
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "硬件加速"
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "显示性别"
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "姓名"
+msgid "Show level"
+msgstr "显示水平"
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr "显示自己的名字"
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr "目标死球员"
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "可见姓名"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr "显示状态"
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "？？？"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
-msgstr "将所有密语放于标签夜"
-
-#: src/gui/setup_players.cpp:234
-#, fuzzy
-msgid "Show gender"
-msgstr "显示姓名"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "旧"
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "玩家"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr "关系"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "微小"
+#: src/gui/setup_theme.cpp:107
+msgid "Tiny (10)"
+msgstr "小（10）"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Small (11)"
+msgstr "小 (11)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Medium (12)"
+msgstr "中 (12)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Large (13)"
+msgstr "大 (13)"
+
+#: src/gui/setup_theme.cpp:111
+msgid "Big (14)"
+msgstr "大(14)"
+
+#: src/gui/setup_theme.cpp:112
+msgid "Huge (15)"
+msgstr "巨大的 (15)"
+
+#: src/gui/setup_theme.cpp:143
+msgid "Theme"
+msgstr "主题"
+
+#: src/gui/setup_theme.cpp:145
+msgid "Gui theme"
+msgstr "桂主题"
+
+#: src/gui/setup_theme.cpp:146
+msgid "Main Font"
+msgstr "主要字体"
+
+#: src/gui/setup_theme.cpp:147
+msgid "Bold font"
+msgstr "加粗字体"
+
+#: src/gui/setup_theme.cpp:148
+msgid "Particle font"
+msgstr "粒子字体"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "小"
+#: src/gui/setup_theme.cpp:149
+msgid "Help font"
+msgstr "帮助字体"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "中等"
+#: src/gui/setup_theme.cpp:150
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
+msgid "Font size"
+msgstr "字体大小"
+
+#: src/gui/setup_theme.cpp:299
+msgid "Theme Changed"
+msgstr "主题更改"
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "大"
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr "重启您的游戏客户端以使变更生效。"
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr "软件"
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr "快速的OpenGL"
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "无文本"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "文本"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "气泡，无名"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "有名气泡"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "关闭"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "可见姓名"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "聊天中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "作为发射武器"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "纹理细节"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "字体大小"
+msgstr "l"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "否"
+msgstr "w"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "改变成OpenGL"
+msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "分辨率已变更"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
+msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "重启您的游戏客户端以使变更生效。"
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr "屏幕分辨率已更改"
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "粒子效果设置已变更。"
+msgstr "粒子效果更改的设置。"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "变更会在地图更换时生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr "个人商店"
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr "购买物品"
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr "出售物品"
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "添加"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr "公布"
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr "显示在公布的联系"
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "请求交易"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr "%s想要%s %s 你接受吗？"
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "技能点数：%d"
+msgstr "技能点：%d个"
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "技能点数：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "技能"
+msgstr "技能为%d"
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr "等级: %d"
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "等级：%d"
+msgstr "等级: %d（%+d）"
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "等级：%d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:160
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "帮会已创建"
+msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "创建帮会"
+msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "确定退出游戏？"
+msgstr "你确定要离开工会%s吗？"
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "t"
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "邀请一个用户加入队伍"
+msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "邀请一个用户加入队伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
-msgstr ""
+msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "确定退出游戏？"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "创建角色"
+msgstr "建立"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "邀请用户"
+msgstr "邀请"
 
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "大"
-
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "帮会"
+msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "选择你的服务器"
+msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:497
-#, fuzzy
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "接受到一个已经存在的帮会邀请。"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "接受帮会邀请"
+msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s已经邀请你加入他们的帮会。"
+msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "帮会"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "选择你的服务器"
+msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
+msgstr "特价商品"
+
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr "(?)移动到目标"
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr "(?) 攻击"
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr "(G) 去攻击"
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr "(?)拿起"
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP："
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#, c-format
+msgid "Character points: %d"
+msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP："
+#: src/gui/statuswindow.cpp:267
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "经验："
+#: src/gui/statuswindow.cpp:323
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金钱：%d"
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+msgid "(D)"
+msgstr "(D)"
+
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+msgid "(I)"
+msgstr "(I)"
+
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+msgid "(c)"
+msgstr "(c)"
+
+#: src/gui/statuswindow.cpp:655
+msgid "(C)"
+msgstr "(C)"
+
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+msgid "(d)"
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+msgid "(?)"
+msgstr "(?)"
+
+#: src/gui/statuswindow.cpp:672
+msgid "(a)"
+msgstr "(a)"
+
+#: src/gui/statuswindow.cpp:683
+msgid "(0)"
+msgstr "(0)"
+
+#: src/gui/statuswindow.cpp:686
+msgid "(1)"
+msgstr "(1)"
+
+#: src/gui/statuswindow.cpp:689
+msgid "(2)"
+msgstr "(2)"
+
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+msgid "(3)"
+msgstr "(3)"
+
+#: src/gui/statuswindow.cpp:695
+msgid "(5)"
+msgstr "(5)"
+
+#: src/gui/statuswindow.cpp:698
+msgid "(7)"
+msgstr "(7)"
+
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+msgid "(A)"
+msgstr "(A)"
+
+#: src/gui/statuswindow.cpp:714
+msgid "(R)"
+msgstr "(R)"
+
+#: src/gui/statuswindow.cpp:717
+msgid "(M)"
+msgstr "(M)"
+
+#: src/gui/statuswindow.cpp:720
+msgid "(P)"
+msgstr "(P)"
+
+#: src/gui/statuswindow.cpp:734
+msgid "(s)"
+msgstr "(s)"
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+msgid "(S)"
+msgstr "(S)"
+
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
+msgid "(G)"
+msgstr "(G)"
+
+#: src/gui/statuswindow.cpp:766
+msgid "(f)"
+msgstr "(f)"
+
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
+msgid "(F)"
+msgstr "(F)"
+
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+msgid "(U)"
+msgstr "(U)"
+
+#: src/gui/statuswindow.cpp:802
+msgid "(g)"
+msgstr "(g)"
+
+#: src/gui/statuswindow.cpp:819
+msgid "(N)"
+msgstr "(N)"
+
+#: src/gui/statuswindow.cpp:825
+msgid "(u)"
+msgstr "(u)"
+
+#: src/gui/statuswindow.cpp:831
+msgid "(e)"
+msgstr "(e)"
+
+#: src/gui/statuswindow.cpp:834
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+msgid "(O)"
+msgstr "(O)"
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr "没有目标"
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "职业："
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "角色状态可以"
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "技能点数：%d"
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等级：%d"
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr "生活魔术"
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "仓库"
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr "战魔"
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr "蜕变魔术"
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr "大自然的神奇"
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr "星芒魔术"
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr "命令编辑器"
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr "魔术"
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr "其他"
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr "符号："
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr "命令："
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr "法力："
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr "目标类型："
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr "图示："
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr "魔法等级："
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr "魔法学院："
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr "学校层次："
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr "保存"
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "添加"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "你得到%s。"
+msgstr "你得到%s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
-
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
+
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-#, fuzzy
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 您稍候再次尝试"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "存在"
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr "豁免计算名称"
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr "忽略名称"
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "其他玩家名"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "自己的名字"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM名"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCs"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr "怪物的HPl"
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr "怪物的HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr "党的议员"
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr "公会成员"
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "粒子效果"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "拾起通知"
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "到期通知"
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr "玩家惠普酒吧"
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr "玩家HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr "玩家怪物"
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr "怪物点击播放器"
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr "其他玩家点击本土球员"
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "会心一击"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr "当前玩家"
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "失误"
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr "门户高亮"
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr "步行高亮"
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr "怪物攻击范围"
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr "家居广场"
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr "家居广场边界"
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr "路点"
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr "谁在线 - 更新"
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr "更新"
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr "谁在线 -"
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr "谁在线 - 错误"
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr "谁在线 - 更新"
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr "战斗"
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr "/usr > 列出当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > 设置当前聊天频道的主题"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr "/quit > 离开频道"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr "/op > 使用户称为频道管理员"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > 把用户踢出频道"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "命令：/users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr "该命令显示当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "命令：/topic <讯息>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr "该命令设置主题为<讯息>"
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "命令：/quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr "该命令离开当前频道"
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "如果你是该频道的最后成员，离开后该频道将被删除。"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "命令：/op <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>成为频道管理员。"
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "频道管理员可以踢出或者op频道内的其他用户"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "命令：/kick <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr "该命令致使<昵称>离开频道。"
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr "需要一个用户来操作"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr "踢人时需要指定用户！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s悄悄的对您说： "
+msgstr "%s私语:%s"
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "无法发送空白信息！"
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "编辑"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > "
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > 停止忽视了其他"
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "命令：/item"
+msgstr "命令：/ignore"
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
+msgstr "此命令忽略了其他，不管目前的关系。"
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "命令: /uninore <>"
+
+#: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr "机器人检查"
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr "谁在线"
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr "表情符号"
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "快捷键"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "选择OK"
+msgstr "选择世界"
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "改变"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "选择你的服务器"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:251
+msgid "Storage"
+msgstr "仓库"
+
+#: src/inventory.cpp:253
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "攻击"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr "移动到目标"
+
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr "更改移动到目标类型"
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr "移动到首页位置"
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr "设为首页位置"
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr "移动导航点"
+
+#: src/keyboardconfig.cpp:61
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "说话"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "对准最近目标"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr "更改皮卡型"
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
+msgstr "更改地图浏览模式"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr "项目的快捷方式键"
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "技能窗口"
+msgstr "社会窗口"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "状态窗口"
+msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
+msgstr "橱窗"
+
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr "快速下拉窗口"
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr "杀敌统计窗口"
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr "命令的窗口"
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr "BOT检查窗口"
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr "谁是在线窗口"
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr "上一页社会标签"
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr "关闭当前聊天标签"
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr "自动完成交谈"
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr "停用聊天输入"
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr "直接向上"
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr "直接下"
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr "直接离开"
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr "直接对"
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr "快速下降序号项目"
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr "快速愈合的目标或自我"
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr "使用魔法攻击"
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr "切换魔法攻击"
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr "更改移动类型"
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr "更改攻击型武器"
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr "更改攻击类型"
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr "更改跟随模式"
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr "更改仿模式"
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr "开/关 音频"
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr "启用/禁用离开模式"
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr "从键盘模拟右键单击"
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr "切换模式"
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
+msgstr ""
+
+#: src/localplayer.cpp:372
+msgid "You were killed by "
+msgstr "你被打死"
+
+#: src/localplayer.cpp:1403
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1405
+msgid "Item is too heavy."
+msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
-msgstr "无法拾取物品。"
+#: src/localplayer.cpp:1407
+msgid "Item is too far away."
+msgstr "物品太远了。"
+
+#: src/localplayer.cpp:1409
+msgid "Inventory is full."
+msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
-#, fuzzy, c-format
+#: src/localplayer.cpp:1411
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1414
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1417
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1441
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "你捡起%s [@@%d|%s@@]。"
-msgstr[1] "你捡起%s [@@%d|%s@@]。"
+msgstr[0] "你拾起%d[@@%d|%s @@]。"
+
+#: src/localplayer.cpp:3175
+msgid "Away"
+msgstr "距离"
+
+#: src/localplayer.cpp:3476
+msgid "Follow: "
+msgstr "跟随:"
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:44
+#: src/localplayer.cpp:3485
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3847
+msgid "You see "
+msgstr "你看"
+
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
+msgstr "manaplus [选项] [mana-file]"
+
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr "[mana-file] : The mana is an XML file (.mana)"
+
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr "用于设置自定义参数"
+
+#: src/main.cpp:50
+msgid "              to the manaplus client."
+msgstr ""
+
+#: src/main.cpp:52
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:45
-#, fuzzy
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
+msgstr "-l--log-file 日志文件"
+
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version\t:显示版本号"
+msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:46
-#, fuzzy
+#: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help\t: 显示该帮助"
+msgstr ""
 
-#: src/main.cpp:47
-#, fuzzy
+#: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file\t: 使用的配置文件"
+msgstr ""
 
-#: src/main.cpp:48
-#, fuzzy
+#: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username\t:以该用户名登录游戏"
+msgstr ""
 
-#: src/main.cpp:49
-#, fuzzy
+#: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password\t: 以该密码登录"
+msgstr ""
 
-#: src/main.cpp:50
-#, fuzzy
+#: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character\t: 以该角色登录"
+msgstr ""
 
-#: src/main.cpp:51
-#, fuzzy
+#: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server\t: 登录服务器名或IP"
+msgstr ""
 
-#: src/main.cpp:52
-#, fuzzy
+#: src/main.cpp:62
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port\t: 登录服务器端口"
+msgstr ""
 
-#: src/main.cpp:53
-#, fuzzy
+#: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host\t: 使用该更新主机"
+msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:54
-#, fuzzy
+#: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default\t: 选择某人角色服务器和角色"
+msgstr ""
 
-#: src/main.cpp:56
-#, fuzzy
+#: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update\t:跳过下载更新"
+msgstr ""
 
-#: src/main.cpp:57
-#, fuzzy
+#: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data\t: 从此目录加载游戏数据"
+msgstr ""
 
-#: src/main.cpp:58
-#, fuzzy
+#: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
+msgstr ""
 
-#: src/main.cpp:59
-#, fuzzy
+#: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
-
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl\t:为该次会话关闭OpenGL"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "踢出失败！"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "成功踢出！"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
 msgstr "无物可供出售。"
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
 msgstr "谢谢你的购买。"
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
 msgstr "无法购买。"
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "感谢您的出售。"
-
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "无法出售."
-
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "访问被拒绝"
-
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "不能使用该ID"
-
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "选择人物时遇到未知错误"
-
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "创建角色失败。很可能名称已被占用。"
-
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "信息"
-
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "角色已删除。"
-
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "删除角色失败。"
-
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr "力量："
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr "敏捷："
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr "生命："
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr "智力："
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr "灵巧："
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr "幸运："
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "密语无法发送，用户已离线。"
-
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上。"
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "玩家"
-
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
-msgstr "聊天频道不被支持！"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "姓名"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "请求交易"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "错误的名称。"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
-msgstr "力量 %+d"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "不正确的统计。"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
-msgstr "敏捷 %+d"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "不正确的头发。"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "生命 %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智慧 %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "信息"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "敏捷 %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "角色已删除。"
 
-#: src/net/ea/generalhandler.cpp:107
-#, c-format
-msgid "Luck %+d"
-msgstr "幸运 %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "删除角色失败。"
 
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "验证失败"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "聊天频道不被支持！"
 
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
-msgid "No servers available."
-msgstr "无可用服务器"
+#: src/net/ea/chathandler.cpp:128
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "密语无法发送，%s离线。"
 
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "某人正在尝试使用该帐号"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "该帐号已经登录"
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "MVP球员。"
 
-#: src/net/ea/generalhandler.cpp:143
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "检测到调速作弊"
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "MVP球员："
 
-#: src/net/ea/generalhandler.cpp:146
-#, fuzzy
-msgid "Duplicated login."
-msgstr "重复登录"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr "在线用户数：%d"
 
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "未知连接错误"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "游戏"
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "和服务器失去连接"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "力量"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "命令：/invite <昵称>"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "敏捷"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "生命"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "命令：/leave"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "智慧"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "敏捷"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > 显示该帮助信息。"
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "幸运"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > "
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "防御："
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > "
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "魔攻："
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick >"
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "魔防："
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "帮会已创建"
 
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Ac精确度："
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr "您已经在公会。"
 
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% E回避率："
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "会心一击"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "未知的服务器的响应。"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > 邀请某一玩家加入您的帮会"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "工会会长: %s"
 
-#: src/net/ea/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > 离开你所在的帮会"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr "工会等级: %d"
 
-#: src/net/ea/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > 把某人踢出你所在的帮会"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "在线玩家: %d"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "命令：/invite <昵称>"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr "最大成员: %d"
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "该命令邀请<昵称>和你聚会。"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "平均等级: %d"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "命令：/leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
+msgstr "工会经验值: %d"
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "该命令致使玩家离开帮会"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "工会下一级所需经验: %d"
 
-#: src/net/ea/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "帮会名称缺失。"
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s现在是你帮会中的成员了。"
+msgstr "用户现在是你们的工会成员了."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "未知邀请应答%s。"
+msgstr "未知工会邀请响应."
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
-msgstr ""
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr "你已经离开工会."
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s已经离开工会."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr "你已经被工会开除！."
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s已经被工会开除."
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 把某人踢出你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改变帮会项目共享选项"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改变帮会经验共享选项"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "该命令邀请<昵称>和你聚会。"
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改变帮会的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
+"<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr "命令：/item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改变帮会的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2969,109 +4541,99 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
 "\"false\"用来关闭经验共享。"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:141
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "物品共享开启。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:176
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "经验共享开启。"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr "使用物品失败。"
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr "无法装备。"
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "无法卸载装备。"
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录。"
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr "原密码错误"
+msgstr "旧密码不正确。"
 
-#: src/net/ea/loginhandler.cpp:85
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "新密码太短"
+msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "未明错误"
+msgstr "未知的错误。"
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "未注册ID"
+msgstr "未注册的ID。"
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "错误的密码"
+msgstr "错误的密码。"
 
-#: src/net/ea/loginhandler.cpp:155
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "帐号期满"
+msgstr "账户过期失效。"
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "登录请求被拒绝"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "你已被永久性禁止游戏。请联系GM团队。"
+msgstr "您已被永久禁止进入游戏。请联系GM团队。"
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr "客户端太旧。"
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3080,26 +4642,19 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "该用户名已被使用"
-
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "无法出售."
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "正在连接 地图 服务器..."
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
@@ -3107,860 +4662,803 @@ msgstr "无法创建帮会。"
 msgid "Party successfully created."
 msgstr "帮会创建成功。"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s已经加入你的党。"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了。"
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "未知邀请应答%s。"
+msgid "%s can't join your party because party is full."
+msgstr "%s不能加入团队，因为团队成员已满。"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "这种方式的邀请暂时不支持。"
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s不在你的帮会中！"
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "你再也不是那样的生机勃勃了。"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "游戏结束！"
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr "投入游戏币继续。"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "被消灭了。"
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr "你还没死，你只是在休息"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr "讯息"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
-#: src/net/ea/playerhandler.cpp:333
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "你捡起 "
+msgstr "你捡起了%s"
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "你花费 %s."
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "不能提升技能!"
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "请求交易"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受？"
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易不可能进行。与交易伙伴太过太过遥远"
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "交易不可能进行。角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因。"
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被取消。"
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr "未处理的交易取消分组。"
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr "添加物品失败。您不能交易这项物品."
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "交易取消。"
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "力量%+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "敏捷 %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "敏捷"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "灵巧%+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "生命"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "活力%+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "智慧"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "智慧%+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "意志"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "意志力%+.1f"
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr " 按OK重新开始"
+msgstr "按确定以重生。"
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "你完蛋了"
+msgstr "你死了"
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr "已经登录"
+msgstr "未登录。"
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "无空槽。"
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "名称无效。"
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "用户名已存在"
+msgstr "人物的名字已经存在。"
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "无效的发型。"
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "头发的颜色无效。"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "无效的性别。"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "角色状态可以"
+msgstr "字符的统计太高。"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "角色状态可以"
+msgstr "字符的统计过低。"
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "角色已删除。"
+msgstr "删除。"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "请选择交易的物品数量。"
+msgstr "范围。"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "未明错误"
+msgstr "未知错误(%d)"
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr "无 游戏服务器 可用。"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力："
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "主题：%s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "玩家攻击怪兽"
+msgstr "玩家在此通道："
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "命令：/join <频道>"
+msgstr "加入通道时发生错误。"
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "请求加入频道%s。"
+msgstr "上市渠道。"
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s加入了帮会。"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s已被%s踢出"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "未知命令。"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力："
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "帮会已创建"
+msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr ""
+msgstr "创建公会时发生错误。"
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr "邀请已发送。"
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr "会员晋升成功。"
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr "晋升会员失败。"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "错误的 magic_token"
+msgstr "错误magic_token。"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "已经登录"
+msgstr "已登录。"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "服务器满载"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr "帐户被禁止。"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "新密码错误"
+msgstr "新密码不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "账户未连接。请先登录。"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "新电子邮件地址不正确"
+msgstr "新的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "原电子邮件地址不正确"
+msgstr "旧的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "新电子邮件地址已经存在。"
+msgstr "新的电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "客户端注册是不允许的。请联系服务器管理。"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "客户端版本太旧"
+msgstr "客户端版本太旧。"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "错误的用户名或密码"
+msgstr "用户名或密码错误。"
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr "帐户被禁止"
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "登录尝试后，以前的尝试还为时过早。"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "错误的用户名，密码或者电子邮件地址"
+msgstr "错误的用户名，密码或电子邮件地址。"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "用户名已存在"
+msgstr "用户名已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "电子邮件地址已存在"
+msgstr "电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr "加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr "%s加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s拒绝了您的邀请。"
+msgstr "%s的拒绝你的邀请。"
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr "正在接受交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr "忽略交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "与%s交易中"
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽略%s@@"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "踢出失败！"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "成功踢出！"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "感谢您的出售。"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "无法出售."
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr "不能出售，交易。"
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "攻击 %+d"
+msgid "Strength %+d"
+msgstr "力量 %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "防护 %+d"
+msgid "Agility %+d"
+msgstr "敏捷 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "Vitality %+d"
+msgstr "生命 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "未知物品"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知怪兽"
-
-#~ msgid "no"
-#~ msgstr "不"
-
-#~ msgid "Buddy"
-#~ msgstr "好友"
-
-#~ msgid "Buddy List"
-#~ msgstr "好友列表"
-
-#~ msgid "Description: %s"
-#~ msgstr "描述：%s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "效果：%s"
-
-#~ msgid "Previous"
-#~ msgstr "上一个"
-
-#~ msgid "New"
-#~ msgstr "新建"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "职业等级：%d"
-
-#~ msgid "Present: "
-#~ msgstr "出席： "
-
-#~ msgid "Quit Guild"
-#~ msgstr "退出帮会"
-
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Recent:"
-#~ msgstr "最近的"
-
-#~ msgid "Magic"
-#~ msgstr "魔法"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "释放测试符咒1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "释放测试符咒2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "释放测试符咒3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "双手武器"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|与%s交易@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|攻击%s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|忽视%s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|忽略%s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|取消@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|捡起%s@@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|卸载@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|装备@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|使用@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|丢弃@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|分离@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|存贮@@"
-
-#~ msgid "Select Server"
-#~ msgstr "选择服务器"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "切换到此时失败： "
-
-#~ msgid "windowed"
-#~ msgstr "窗口化"
-
-#~ msgid "fullscreen"
-#~ msgstr "全屏"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "神秘技能"
-
-#~ msgid "Weapons"
-#~ msgstr "武器"
-
-#~ msgid "Crafts"
-#~ msgstr "技艺"
-
-#~ msgid "Stats"
-#~ msgstr "状态"
-
-#~ msgid "Total"
-#~ msgstr "总计"
-
-#~ msgid "Cost"
-#~ msgstr "花费"
-
-#~ msgid "Attack:"
-#~ msgstr "攻击:"
+msgid "Intelligence %+d"
+msgstr "智慧 %+d"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% 伤害反射："
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "敏捷 %+d"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "剩余状态点数：%d"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "幸运 %+d"
 
-#~ msgid "Max level"
-#~ msgstr "最大等级"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr "身份验证失败。"
 
-#~ msgid "curl error "
-#~ msgstr "curl错误 "
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr "没有可用的服务器。"
 
-#~ msgid " host: "
-#~ msgstr " 主机： "
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr "别人尝试使用该帐户。"
 
-#~ msgid "Guilds"
-#~ msgstr "工会"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr "此帐户已登录。"
 
-#~ msgid "Buddys"
-#~ msgstr "好友"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr "检测速度劈。"
 
-#~ msgid "Party Window"
-#~ msgstr "帮会窗口"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr "重复登录。"
 
-#~ msgid "Unarmed"
-#~ msgstr "徒手的"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr "未知的连接错误。"
 
-#~ msgid "Knife"
-#~ msgstr "匕首"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "和服务器失去连接"
 
-#~ msgid "Sword"
-#~ msgstr "剑"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "幸运"
 
-# 长斧？
-#~ msgid "Polearm"
-#~ msgstr "戟"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr "国防"
 
-#~ msgid "Staff"
-#~ msgstr "工作人员"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "Whip"
-#~ msgstr "抖动"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Bow"
-#~ msgstr "弓"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr "％精度"
 
-#~ msgid "Shooting"
-#~ msgstr "射击"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr "％闪避"
 
-#~ msgid "Mace"
-#~ msgstr "狼牙棒"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr "％"
 
-#~ msgid "Axe"
-#~ msgstr "斧头"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr "攻击延迟"
 
-#~ msgid "Thrown"
-#~ msgstr "投掷"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr "步行延迟"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "未知技能"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr "攻击范围"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " 不能被创建，不存在！退出中。"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr "空的地址给网络：连接（）！"
 
-#~ msgid "Couldn't set "
-#~ msgstr "无法设置 "
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr "无法解析主机“"
 
-#~ msgid " video mode: "
-#~ msgstr " 视频模式： "
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr "连接到服务器终止。"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s不在你的帮会中！"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "正在连接 角色 服务器..."
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "正在连接 帐号 服务器..."
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > create之别名"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "命令： /new <帮会名>"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr "流动的泡沫"
 
-#~ msgid "a"
-#~ msgstr "一个"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "未知怪兽"
 
-#~ msgid "Unnamed"
-#~ msgstr "未知物品"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "攻击 %+d"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@捡起|捡起%s@@"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "防护 %+d"
 
-#~ msgid "Save player list"
-#~ msgstr "保存玩家列表"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll laziness"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Scroll radius"
-#~ msgstr "滑动半径"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "未知物品"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index abeee5078..856c92b9a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,3012 +1,4645 @@
-# Traditional Chinese translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-# SECOND AUTHOR <NETWAREBOSS>,2009
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-06-08 22:11+0000\n"
-"Last-Translator: lok0919 <lok0919@gmail.com>\n"
-"Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
-"net>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: China\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "正在連接到地圖伺服器..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "登入"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "選擇角色"
+msgstr ""
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "正在連接到地圖伺服器..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr ""
+
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "密碼："
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "更改"
+msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "註冊"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- 說明 --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > 顯示地圖名稱"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > 顯示線上人數"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > 告訴一些有關你的事"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > 清除此窗口"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > 發送私人訊息給玩家"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > 等同msg"
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > 等同msg"
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > 等同query"
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > 顯示所有公共頻道"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > 加入/建立一個頻道"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/party > 邀請玩家加入隊伍"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party > 邀請玩家加入隊伍"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > 開始錄製聊天至外部文件"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > 獲取現在的玩家名單（如果錄製聊天中，會發送到聊天記錄）"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > 公告 (GM only)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "指令： /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "該指令可顯示所有可用指令。"
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "指令： /help <指令>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "該指令會顯示<指令>的幫助訊息"
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "指令： /announce <信息>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "該指令會發送<信息>給所有線上用戶。"
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "指令： /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "該指令可以清除聊天紀錄。"
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "/join <頻道>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "這調指令可顯示目前線上人數。"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "/join <頻道>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "這個指令令你進入 <頻道>."
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "如果<頻道>不存在，將會被建立"
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "這個指令會列出所有頻道"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "/me <信息>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "這個指令會告訴其他人你正在 <信息>."
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "指令： /clear"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "這個指令令你進入 <頻道>."
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "指令： /announce <信息>"
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "指令: /where"
-
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "這個指令顯示目前地圖名。"
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "指令： /who"
-
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "這調指令可顯示目前線上人數。"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "輸入 /help 獲取指令列表。"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
+msgstr ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:383
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:397
-#, c-format
-msgid "Requesting to join channel %s."
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: src/commandhandler.h:40
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+msgid "General"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
+#: src/game.cpp:475
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
+#: src/game.cpp:483
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
+#: src/game.cpp:523
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/game.cpp:537
+msgid "Network Error"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/game.cpp:1184
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
+#: src/game.cpp:1191
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/game.cpp:1576
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/game.cpp:1577
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/gui/beingpopup.cpp:118
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/gui/beingpopup.cpp:132
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Guild: %s"
 msgstr ""
 
-#: src/game.cpp:172
-msgid "General"
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
 msgstr ""
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
 msgstr ""
 
-#: src/game.cpp:355
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "正在連接角色伺服器..."
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "名字"
 
-#: src/game.cpp:360
-msgid "Network Error"
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
 msgstr ""
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
 msgstr ""
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
 msgstr ""
 
-#: src/game.cpp:946
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "不能加入隊伍！"
-
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
-#, c-format
-msgid "Party: %s"
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "用戶名稱至少需要%d個字元。"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "用戶名稱不能少於%d個字元"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "密碼至少需要%d個字元"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "密碼不能少於%d個字元。"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名字："
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "灰色："
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "髮型："
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "註冊"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "更改"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "關閉"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
-
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "否"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
-msgid "Music: %s"
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "名字：%s"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Minimap: %s"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "紋理細節"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "紋理細節"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "關閉"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "確定"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "關閉"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "丟棄"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:148
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "確定"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "效果：%s"
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "伺服器："
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "保存用戶名"
+msgstr ""
+
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "更改"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "下一個"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "卸下裝備"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "交易"
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
 msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
 msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@交易|與%s交易@@"
-
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "攻擊:"
-
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "對%s竊竊私語：%s"
-
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "忽略"
-
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "交換伺服器"
-
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "交換角色"
-
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr ""
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr "交換伺服器"
 
-#: src/gui/register.cpp:69
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr "交換角色"
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "確認："
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "電子郵件"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用戶名稱至少需要%d個字元。"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用戶名稱不能少於%d個字元"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密碼至少需要%d個字元"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密碼不能少於%d個字元。"
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "伺服器："
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port："
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "伺服器："
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "連線中..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "自訂滑鼠標"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "正在連接到地圖伺服器..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "聲音"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "音效"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "音效音量"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
+msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "開始"
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "重置視窗"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "矯正"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "搖桿"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋轉手柄"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "名字"
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "玩家"
-
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_video.cpp:194
+msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS限制："
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
-msgstr ""
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "紋理細節"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "否"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "切換全螢幕"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "切換為OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "增加"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "技能點數：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "技能點數：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "技能"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "等級：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "等級：%d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "你確定想刪除這個角色？"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > 邀請玩家加入隊伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "/party > 邀請玩家加入隊伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "你確定想刪除這個角色？"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "新增角色"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "職業：%d"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "角色狀態確定"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "技能點數：%d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "增加"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "你付出:"
+msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "對%s竊竊私語：%s"
-
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "指令: /where"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "這調指令可顯示目前線上人數。"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "快捷鍵"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "選擇伺服器"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "更改"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
+msgstr ""
+
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3174
+msgid "Away"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
 msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/help > 顯示幫助"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
 #: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
 msgstr ""
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
+msgid "  -h --help           : Display this help"
 msgstr ""
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "玩家"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "名字"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "聊天新增失敗！"
-
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Someone else is trying to use this account."
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-msgid "Speed hack detected."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "和伺服器失去連線"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "力量"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "敏捷"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "體力"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "智力"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "閃躲"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "幸運"
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "防禦："
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "摩攻："
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "魔防："
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Ac準確度："
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% E迴避率："
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "% Critical"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > 顯示幫助"
-
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/party > 邀請玩家加入隊伍"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "這個指令會告訴其他人你正在 <信息>."
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "這個指令顯示目前地圖名。"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "不明指令"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "註冊"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "和伺服器失去連線"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-msgid "This user name is already taken."
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "正在連接到地圖伺服器..."
-
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
@@ -3014,683 +4647,804 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "交易失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "顯示表情失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "坐下休息失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "聊天新增失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "不能加入隊伍！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "無法大叫！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "你還沒達到足夠等級！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "HP不夠！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "SP不夠！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "沒有備忘錄"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器無法使用此技能！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "你需要再一顆紅寶石!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "你需要再一棵藍寶石!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "你已負重太多，不能再多!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "阿?那是甚麼?"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "傳送失敗..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "無法偷取任何物品..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "藥水無效..."
-
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "你付出:"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "角色狀態確定"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "角色狀態確定"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "請選擇交易的物品數量"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "不明指令"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "/join <頻道>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "不明指令"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "已完成"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
+msgid "Strength %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
+msgid "Agility %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "Vitality %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+msgid "Intelligence %+d"
+msgstr ""
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
 msgstr ""
 
-#~ msgid "Description: %s"
-#~ msgstr "說明：%s"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "上一個"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "New"
-#~ msgstr "新增"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "Job Level: %d"
-#~ msgstr "職業等級：%d"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "確認"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@攻擊|攻擊%s@@"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@取消|取消@@"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@使用|卸下@@"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "和伺服器失去連線"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@使用|裝備@@"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "幸運"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@使用|使用@@"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@丟棄|丟棄@@"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@分離|分離@@"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
 
-#~ msgid "Mystery Skill"
-#~ msgstr "神秘技能"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Stats"
-#~ msgstr "狀態"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Total"
-#~ msgstr "總共"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Cost"
-#~ msgstr "需求"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
 
-#~ msgid "% Reflex:"
-#~ msgstr "% 傷害反射："
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr ""
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "剩餘狀態點數：%d"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "正在連接帳號伺服器..."
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "未知物品"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Save player list"
-#~ msgstr "保存玩家列表"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr ""
 
-#~ msgid "Scroll radius"
-#~ msgstr "捲動半徑"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "捲動延遲"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 884a9b948..6b621f8f2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4177 +1,5450 @@
-# Traditional Chinese translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-# SECOND AUTHOR <NETWAREBOSS>,2009
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2010-01-23 17:23+0000\n"
-"Last-Translator: Peierh <Unknown>\n"
-"Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
-"net>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: China\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:542
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1514
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1519
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "正在連接到地圖伺服器..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
-msgstr "登入"
+msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "選擇角色"
+msgstr ""
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "正在連接到地圖伺服器..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr ""
+
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "密碼："
+msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "更改"
+msgstr ""
 
-#: src/client.cpp:863
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "成功提升會員."
+msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "取消註冊"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "無效的更新主機: "
+msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- 說明 --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help >顯示指令說明"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > 顯示地圖名稱"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > 顯示線上使用者的數量"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > 顯示關於自己的資訊"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > 清除這個視窗"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > 傳送私人訊息給某使用者"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > 效果同 msg"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > 效果同 msg"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "不能以名稱 \"%s\" 創建一個密語標籤! 該名稱已存在或對方是你."
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > 建立與另一個使用者的私人訊息分頁"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "要求參加頻道 %s"
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > 效果同 query"
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr "漏掉隊伍名稱。"
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > 顯示所有公開頻道"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > 加入或建立頻道"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > 建立新的隊伍"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party > 邀請使用者組隊"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > 開始紀錄對話內容到外部檔案"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > 是否切換回聊天視窗"
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > 取得上線玩家的清單（如果開啟記錄，傳送到聊天紀錄）"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > 全域廣播 (GM 專用)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "查看更多資訊, 輸入 /help <指令>."
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "指令： /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "該指令可顯示所有可用指令。"
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "指令： /help <指令>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "該指令會顯示<指令>的幫助訊息"
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "指令： /announce <信息>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "該指令會發送<信息>給所有線上用戶。"
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "指令： /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "該指令可以清除聊天紀錄。"
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "/item <政策>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "這調指令可顯示目前線上人數。"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "指令: /join <頻道名稱>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "這個指令可以讓你輸入 <頻道名稱>."
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "假如 <頻道名稱> 不存在,那就建立."
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "指令： /list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "這個指令會顯示所有頻道的清單。"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "指令： /me <message>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "指令： /msg <nick> <message>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "指令： /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "指令： /w <nick> <message>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "指令： /query <nick>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "指令： /q <nick>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "指令： /create <隊伍名稱>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "這些指令會建立叫做 <隊伍名稱> 的新隊伍。"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
+msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "指令： /party <nick>"
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr "關閉密語"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "這個指令會邀請 <nick> 跟您組隊。"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
+msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "指令： /present"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
+msgstr "切換聊天"
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
+#: src/commandhandler.cpp:555
+msgid "friend"
 msgstr ""
-"該指令顯示玩家有聽到並傳送到任何日誌記錄，如果記錄，聊天記錄或其他方式。"
-
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "指令： /record <filename>"
-
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "指令： /record"
-
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "這個指令會結束錄製的作業階段。"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
+msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "指令： /toggle <state>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
+msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr "這指令用來設定\"enter\"鍵是否切換聊天記錄,或者自動關閉記錄"
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
-"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no\"、"
-"\"false\" 來代表切換為關閉."
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "指令： /toggle"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "這個指令顯示輸入切換狀態"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "/item <政策>"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
+msgstr ""
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "指令: /where"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "這個指令顯示目前地圖名。"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "指令： /who"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "這調指令可顯示目前線上人數。"
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "輸入 /help 獲取指令列表。"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "傳送密語失敗"
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:987
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr "不能以名稱 \"%s\" 創建一個密語標籤! 該名稱已存在或對方是你."
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:995
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "要求參加頻道 %s"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "漏掉隊伍名稱。"
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr "\"ENTER\"切換聊天"
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "關閉密語"
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "\"ENTER\"切換聊天"
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "切換聊天"
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "隊伍已成功的建立。"
-
-#: src/commandhandler.cpp:486
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "該玩家拒絕你的密語"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
+msgstr ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "該玩家拒絕你的密語"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
+msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "抓圖存到 ~/"
+msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "已中斷連線到伺服器,程式將要離開"
+msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "無法載入地圖"
+msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "隊伍(%s)"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+msgid "Name"
+msgstr "名字"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "攻擊"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "說話"
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "重設"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
 msgstr "增加"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
 msgstr "減少"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "最大"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "變更郵件地址"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "帳號: %s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "輸入新的電子郵件地址兩次:"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "用戶名稱至少需要%d個字元。"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "用戶名稱不能少於%d個字元"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "電子郵件已經被註冊"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "輸入新密碼兩次:"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "密碼至少需要%d個字元"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "密碼不能少於%d個字元。"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名字："
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "髮色："
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "髮型："
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "帳號與角色管理"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "取消註冊"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "變更郵件地址"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "關閉"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d 位玩家的清單"
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr "將上線訊息寫入錄製紀錄。"
+msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "否"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "地圖"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "主題: %s"
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "名字：%s"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "小地圖"
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "粒子效果"
+#: src/gui/debugwindow.cpp:393
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "紋理細節"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "環境效果"
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "關閉"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "確定"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "關閉"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:104
+msgid "Slots:"
+msgstr "欄位:"
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "丟棄"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "欄位:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+msgid "Store"
+msgstr "寄放"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr "取回"
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "確定"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "重量: "
+msgstr ""
+
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:65
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+msgid "Last kill exp:"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:361
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:367
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "伺服器："
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "保存用戶名"
+msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "伺服器"
+msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "地圖"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "等待伺服器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "確認"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "重設"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "下一個"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "存至:"
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "傳送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, fuzzy, c-format
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
 msgid "Outfit: %d"
-msgstr "體力: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
+#: src/gui/outfitwindow.cpp:87
 msgid "Unequip first"
-msgstr "卸下裝備"
+msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文字"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文字陰影"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "交易"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文字輪廓"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
+msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "進度列標籤"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
+msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "突顯"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr ""
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "分頁突顯"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
+msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太貴"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已裝備"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "遊戲管理者"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "悄悄話"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "隊伍"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "公會"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "伺服器"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "記錄器"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超連結"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
+msgstr ""
 
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "物件"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他使用者名字"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "我的名字"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
+msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "遊戲管理者名字"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "電腦"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "不明物品類型"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可使用的"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "內衣"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr ""
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "單手武器"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "褲子"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "單手武器"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾牌"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "戒指"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "腕甲"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
+msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "箭"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "撿拾通知"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
+msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "經驗值通知"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
+msgstr ""
 
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻擊怪物"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
+msgstr ""
 
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪物攻擊玩家"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
+msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "致命一擊"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失誤"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
+msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "血量"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 血量"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 血量"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 血量"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "與 %s 交易."
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "攻擊 %+d"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "悄悄話"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|與%s交朋友@@"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "不理"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "忽略"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|完全忽視 %s@@"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|邀請 %s 加入你的公會@@"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|邀請 %s 加入你的隊伍@@"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-#, fuzzy
-msgid "Kick player"
-msgstr "踢人失敗！"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@對話|與 %s 對話@@"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|移除怪物@@"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|增加聊天名單@@"
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "撿拾"
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|加入聊天@@"
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "寄放"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交換伺服器"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:58
 msgid "Switch character"
 msgstr "交換角色"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "結束紀錄"
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "沒有目前的紀錄"
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "已經錄製。"
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "開始錄製..."
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "開始錄製失敗。"
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "正在錄製..."
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "停止錄製"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "確認："
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "電子郵件"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用戶名稱至少需要%d個字元。"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用戶名稱不能少於%d個字元"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密碼至少需要%d個字元"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密碼不能少於%d個字元。"
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "選擇您的伺服器"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "伺服器："
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "端口(port):"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "伺服器："
+msgstr ""
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "連線中..."
+msgstr ""
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "自訂滑鼠標"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "等待伺服器中"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "聲音"
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "音效"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "音效音量"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "沒有文字"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "這是顏色看起來的樣子"
-
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "顏色"
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "將所有的悄悄話放到分頁中"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:108
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:118
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:120
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr "這是顏色看起來的樣子"
+
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "類型: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "狀態"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "暫停"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "光譜"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "延遲: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "紅: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "綠: "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "藍: "
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "重置視窗"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "矯正"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "搖桿"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋轉手柄"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "怪物"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
+
 #: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "名字"
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "可見的名稱"
+
+#: src/gui/setup_players.cpp:69
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:72
+msgid "Unsecure chars in names"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_relations.cpp:70
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_relations.cpp:71
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
 msgstr "不理"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_relations.cpp:73
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
-msgstr "將所有的悄悄話放到分頁中"
-
-#: src/gui/setup_players.cpp:234
-#, fuzzy
-msgid "Show gender"
-msgstr "顯示名稱"
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "玩家"
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "小"
+#: src/gui/setup_theme.cpp:106
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:107
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:108
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:109
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:141
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:143
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:144
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:145
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:146
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:176
+msgid "Font size"
+msgstr "字型大小"
+
+#: src/gui/setup_theme.cpp:282
+msgid "Theme Changed"
+msgstr ""
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "小型"
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
+msgid "Restart your client for the change to take effect."
+msgstr "請重新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "中型"
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "大型"
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "沒有文字"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "文字"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "有聊天泡泡,沒名字"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "聊天泡泡加名字"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "可見的名稱"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "顯示名稱"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "顯示撿拾通知"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "聊天中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "同粒子設定"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPS限制："
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "顯示名稱"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "置頂文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "環境效果"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "紋理細節"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "字型大小"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr "否"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
-#, fuzzy
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "模式和恢復舊模式也沒有！"
+msgstr ""
 
-#: src/gui/setup_video.cpp:387
-#, fuzzy
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "模式和恢復舊模式也沒有！"
+msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr "切換全螢幕"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr "切換為OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "螢幕解析度已變更"
+#: src/gui/setup_video.cpp:602
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "請重新啟動您的客戶端讓變更生效。"
+#: src/gui/setup_video.cpp:603
+msgid "Enter new resolution:                "
+msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr "粒子效果設定值已變更。"
+msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "增加"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "要求交易"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "技能點數：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "技能點數：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "技能"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "等級：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "等級：%d"
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+msgid "Guild"
+msgstr "公會"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:160
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "公會已成立."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "建立公會"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "您確定要離開?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+msgid "Party"
+msgstr "隊伍"
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > 邀請使用者組隊"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "/party > 邀請使用者組隊"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "您確定要離開?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "新增角色"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "邀請使用者"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "大型"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "接受 %s 的派對邀請."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "拒絕 %s 的派對邀請"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "接受 %s 的派對邀請."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "拒絕 %s 的派對邀請"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:463
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1257
+#, c-format
 msgid "Creating guild called %s."
-msgstr "創建公會時發生錯誤."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "公會"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "選擇您的伺服器"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:497
-#, fuzzy
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "收到派對邀請,但而有另一個存在."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s 邀請你參加 %s 派對."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "接受派對邀請"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s 邀請你參加他們的派對."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s 邀請你參加 %s 派對."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "隊伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "選擇您的伺服器"
+msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:197
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:202
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:207
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:212
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:217
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:222
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:240
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:244
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:254
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:259
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:264
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:269
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:274
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:279
+msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:284
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:289
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:297
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:301
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:305
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:309
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:313
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:327
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:332
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:349
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:353
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:357
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:375
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:379
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:383
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:387
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:391
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:395
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:399
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:403
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:412
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:416
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:420
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:424
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:428
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:432
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:436
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:444
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:449
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:454
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:459
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:464
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:468
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:477
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:481
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:485
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:508
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:512
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:516
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:527
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:532
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "體力 :"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "經驗值:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr "魔力:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr "職業:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "體力 :"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "魔力:"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "經驗值:"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "職業:"
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "角色狀態確定"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "技能點數：%d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "貯藏庫"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:115
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:125
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:168
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:189
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:194
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:197
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:200
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:218
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:224
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:230
+msgid "School level:"
+msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:235
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "已確認。請稍候..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "已同意。請稍候..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "增加"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "您得到 %s。"
+msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1  您稍後再試一次"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "物件"
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "其他使用者名字"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "我的名字"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "遊戲管理者名字"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "電腦"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "粒子效果"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "撿拾通知"
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "經驗值通知"
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "致命一擊"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "失誤"
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:101
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:294
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:485
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:516
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > 列出在目前頻道的使用者"
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > 設定目前頻道的主題"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr "/quit > 離開頻道"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr "/op > 讓使用者成為頻道操作者"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > 將使用者踢出此頻道"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "指令： /users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr "這個指令會顯示在這個頻道中的使用者。"
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "指令： /topic <message>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr "這個指令會將主題設定為 <message>。"
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "指令：/quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr "這個指令會離開目前的頻道。"
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "如果您是此頻道中的最後一個人，這個頻道就會被刪除。"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "指令： /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr "這個指令會讓 <nick> 成為頻道操作者。"
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "頻道操作者可以對該頻道中的其他使用者進行 kick 或 op。"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "指令： /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr "這個指令會讓 <nick> 離開此頻道。"
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr "需要指定要成為 op 的使用者！"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr "需要指定要踢掉的使用者！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s 的悄悄話: "
-
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "不能傳送空的聊天訊息！"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr "/close > 關閉悄悄話分頁"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "指令： /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr "這個指令會關閉目前的悄悄話分頁。"
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "指令： /item"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "這調指令可顯示目前線上人數。"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "快捷鍵"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "選擇確定"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "更改"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "選擇您的伺服器"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "右移"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "攻擊"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr ""
+
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
 msgid "Smilie"
 msgstr "史萊姆吃掉妳了~~"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "說話"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "最接近的目標"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "尋找至滑鼠的路徑"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
+msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr "物品視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "技能視窗"
+msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "狀態視窗"
+msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "選擇確定"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:411
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
+msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
-msgstr "不能拾取物品."
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
+msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
-#, fuzzy, c-format
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "你拾取了 %s [@@%d|%s@@]."
-msgstr[1] "你拾取了 %s [@@%d|%s@@]."
+msgstr[0] ""
+
+#: src/localplayer.cpp:3174
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:3478
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/main.cpp:50
+msgid "              to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:44
+#: src/main.cpp:52
 msgid "Options:"
 msgstr "選項:"
 
-#: src/main.cpp:45
-#, fuzzy
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : 顯示遊戲版本"
+msgstr ""
 
-#: src/main.cpp:46
-#, fuzzy
+#: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : 顯示求助說明"
+msgstr ""
 
-#: src/main.cpp:47
-#, fuzzy
+#: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : 使用此設定檔"
+msgstr ""
 
-#: src/main.cpp:48
-#, fuzzy
+#: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
-msgstr "  -U -username : 使用此帳號登入"
+msgstr ""
 
-#: src/main.cpp:49
-#, fuzzy
+#: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : 用此密碼登入"
+msgstr ""
 
-#: src/main.cpp:50
-#, fuzzy
+#: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : 用此帳號登入"
+msgstr ""
 
-#: src/main.cpp:51
-#, fuzzy
+#: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : 登錄伺服器埠名稱或IP位址"
+msgstr ""
 
-#: src/main.cpp:52
-#, fuzzy
+#: src/main.cpp:62
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port : 登錄伺服器埠"
+msgstr ""
 
-#: src/main.cpp:53
-#, fuzzy
+#: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : 使用此更新伺服器"
+msgstr ""
 
-#: src/main.cpp:54
-#, fuzzy
+#: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : 選擇預設的角色伺服器及角色"
+msgstr ""
 
-#: src/main.cpp:56
-#, fuzzy
+#: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : 不使用更新"
+msgstr ""
 
-#: src/main.cpp:57
-#, fuzzy
+#: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d -data : 指定遊戲資料所在的目錄"
+msgstr ""
 
-#: src/main.cpp:58
-#, fuzzy
+#: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : 設定此目錄為家目錄"
+msgstr ""
 
-#: src/main.cpp:59
-#, fuzzy
+#: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : 設定此目錄為家目錄"
-
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : 不使用OpenGL"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "踢人失敗！"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "踢人成功！"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
 msgstr "沒有任何物品可出售."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
 msgstr "謝謝光臨."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
 msgstr "不能購買."
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "謝謝你的出售."
-
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "不能出售."
-
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "存取被拒"
-
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "不能使用這個 ID"
-
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "選擇角色發生不明的失敗"
-
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "建立角色失敗。最有可能的情形是該名稱已經被使用了。"
-
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "資訊"
-
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "角色被刪除."
-
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "刪除角色失敗。"
-
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
-msgstr "力量:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
-msgstr "敏捷:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
-msgstr "體力:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
-msgstr "智力:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
-msgstr "閃躲:"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
-msgstr "幸運:"
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "該玩家已離線,無法送出密語."
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "該玩家拒絕你的密語"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "玩家"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
-msgstr "頻道不支援！"
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "名字"
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "要求交易"
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
-msgstr "力量 %+d"
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
-msgstr "敏捷 %+d"
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "資訊"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "體力 %+d"
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智力 %+d"
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "閃躲 %+d"
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Luck %+d"
-msgstr "幸運  %+d"
-
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "驗證失敗"
-
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
-msgid "No servers available."
-msgstr "沒有可用的伺服器"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "此帳號正在使用中"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "這個帳號已經登入"
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "使用加速器"
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
-#, fuzzy
-msgid "Duplicated login."
-msgstr "重複登入"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "不明的連線錯誤"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "和伺服器失去連線"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "力量"
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "敏捷"
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "體力"
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "智力"
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "閃躲"
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "幸運"
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "防禦："
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "摩攻："
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "魔防："
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "公會已成立."
 
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Ac準確度："
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% E迴避率："
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "致命一擊"
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > 顯示這個說明文件。"
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > 邀請玩家加入您的隊伍"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > 離開您加入的隊伍"
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > 從您加入的隊伍中把某人踢出"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "/invite <暱稱>"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "這個指令會邀請 <nick> 跟您組隊。"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "指令： /leave"
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "這個指令會使玩家離開隊伍。"
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "漏掉隊伍名稱。"
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/ea/guildhandler.cpp:402
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/ea/guildhandler.cpp:406
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr "%s 現在已經是您隊伍的成員。"
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-#, fuzzy
+#: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr "給 %s 的不明邀請回應。"
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > 邀請玩家加入您的隊伍"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > 離開您加入的隊伍"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > 從您加入的隊伍中把某人踢出"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > 顯示/改變隊伍道具分享選項"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "這個指令會使玩家離開隊伍。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "/item <政策>"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "這個指令會改變隊伍的道具分享政策。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 \"0\"、"
-"\"no\"、\"false\" 來停用道具分享。"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr "指令： /item"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "指令： /exp <政策>"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "這個指令會改變此隊伍的經驗值分享政策。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 \"0\"、"
-"\"no\"、\"false\" 來停用經驗值分享。"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr "指令： /exp"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr "物品分享已啟用。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr "物品分享已停用。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr "物品分享不可能。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "物品分享已啟用。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "經驗值分享已啟用。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "經驗值分享已停用。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "經驗值分享不可能。"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
-#, fuzzy
+#: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "經驗值分享已啟用。"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr "不能使用該物品."
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr "無法裝備。"
-
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "無法卸下裝備。"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "找不到該帳號,請重新登入."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr "舊密碼輸入錯誤"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "新設定的密碼長度太短."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "不明的錯誤"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr "未註冊的 ID"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr "錯誤的密碼"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr "帳號已過期"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr "被伺服器拒絕"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
+#: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"你的帳號已被暫時凍結直至 %s.\n"
-"請通過論壇聯絡GM."
-
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "這個使用者名稱已經被使用了"
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "不能出售."
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "正在連接到地圖伺服器..."
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr "無法建立隊伍。"
+msgstr ""
 
 #: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr "隊伍已成功的建立。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s 已經是隊伍的一員。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s 拒絕您的邀請。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s 現在已經是您隊伍的成員。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "給 %s 的不明邀請回應。"
+msgid "%s can't join your party because party is full."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr "您已經離開此隊伍。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/ea/partyhandler.cpp:368
 #, c-format
 msgid "%s has left your party."
-msgstr "%s 已經離開您的隊伍。"
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/ea/partyhandler.cpp:444
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "不明的成員試著要說：%s"
-
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "此時無法支援邀請"
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s 不在您的隊伍中！"
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "您不再是那麼有活力。"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "遊戲結束！"
 
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr "請投入金幣"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "您想要鑑定你的財產嗎？"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發現你的蹤跡..."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "灰飛煙滅了。"
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr "您還沒有死。您現在只是在休息。"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr "你已經沒有更多"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr "你已不再是."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr "你已經過期了,請求助管理員"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr "身體僵硬"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr "失去了生命，您安詳的休息了。"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "如果你沒有這樣做,你就不會上天堂了!!"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr "你的傳奇已經是過去式了!!"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr "你折斷了樹枝"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr "你踢了水桶"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr "死掉了...."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr "您已是前-玩家。"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "你正走向地獄!!"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
 msgid "Message"
-msgstr "訊息"
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
-#, fuzzy, c-format
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
 msgid "You picked up %s."
-msgstr "您已經撿起 "
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
-msgstr "先裝備箭."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "交易失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "顯示表情失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "坐下休息失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "聊天新增失敗！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "不能加入隊伍！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "無法大叫！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "你還沒達到足夠等級！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "HP不夠！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "SP不夠！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "沒有備忘錄"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "您現在不能那麼做！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr "看來您需要更多錢... ;-)"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器無法使用此技能！"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "你需要再一顆紅寶石!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/ea/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "你需要再一棵藍寶石!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/ea/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "你已負重太多，不能再多!"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "阿?那是甚麼?"
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/ea/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "傳送失敗..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/ea/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "無法偷取任何物品..."
+msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/ea/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "藥水無效..."
-
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "要求交易"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:130
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "交易無法進行。交易對象太遠了。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "無法進行交易。該角色不存在。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trade cancelled due to an unknown reason."
-msgstr "由於不明的原因已取消交易。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:146
 #, c-format
 msgid "Trade: You and %s"
-msgstr "交易: 你和 %s"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:156
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "取消和 %s 的交易."
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/ea/tradehandler.cpp:169
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/ea/tradehandler.cpp:231
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "加入物品失敗。交易的伙伴已經超重。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "加入物品失敗。交易對象沒有空的欄位。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
-msgstr "由於不明的原因加入物品失敗。"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "交易已完成。"
 
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr " 請按確認啟動"
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "您已經死亡"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr "已經登入"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "名字已經有人使用"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "角色狀態確定"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "角色狀態確定"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "玩家已刪除"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "請選擇交易的物品數量"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "不明的錯誤"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
 msgstr "沒有可用的遊戲伺服器。"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "主題: %s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "玩家攻擊怪物"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "指令: /join <頻道名稱>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "要求參加頻道 %s"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s 參加了這個派對."
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "不明指令"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "公會已成立."
+msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "創建公會時發生錯誤."
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr "發出邀請."
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr "成功提升會員."
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr "無法提升會員."
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "錯誤的魔法代號"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "已經登入"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "伺服器人數已滿"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "新密碼不正確"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "帳號還沒連線,請先登入"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "新的郵件位址不正確"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "舊得郵件位址不正確"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "電子郵件已經被註冊"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "遊戲版本太老舊!!"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "錯誤的帳號或密碼"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "錯誤的帳號或密碼及電子郵件"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "名字已經有人使用"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "電子郵件已經存在"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr "參加派對."
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr "%s 參加了這個派對."
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s 拒絕您的邀請。"
+msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr "接受傳入的交易要求."
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr "拒絕傳入的交易要求."
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "與 %s 交易."
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽視 %s@@"
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "踢人失敗！"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "踢人成功！"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "謝謝你的出售."
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "不能出售."
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "攻擊 %+d"
+msgid "Strength %+d"
+msgstr "力量 %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "防禦 %+d"
+msgid "Agility %+d"
+msgstr "敏捷 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "體力%+d"
+msgid "Vitality %+d"
+msgstr "體力 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "魔力%+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "不明的物品"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知物品"
-
-#~ msgid "no"
-#~ msgstr "否"
-
-#~ msgid "Buddy"
-#~ msgstr "好友"
-
-#~ msgid "Buddy List"
-#~ msgstr "好友清單"
-
-#~ msgid "Description: %s"
-#~ msgstr "說明：%s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "效果：%s"
-
-#~ msgid "Previous"
-#~ msgstr "上一個"
-
-#~ msgid "New"
-#~ msgstr "新增"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "職業等級：%d"
-
-#~ msgid "Present: "
-#~ msgstr "上線: "
-
-#~ msgid "Quit Guild"
-#~ msgstr "離開公會"
-
-#~ msgid "Ok"
-#~ msgstr "確認"
-
-#~ msgid "Recent:"
-#~ msgstr "記錄的:"
-
-#~ msgid "Magic"
-#~ msgstr "魔法"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "施展測試咒文 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "施展測試咒文 2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "施展測試咒文 3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "雙手武器"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@交易|與%s交易@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@攻擊|攻擊%s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|無視 %s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore| 忽視 %s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore| 不忽視 %s@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|踢掉玩家@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@取消|取消@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|撿起 %s @@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@使用|卸下@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@使用|裝備@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@使用|使用@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@丟棄|丟棄@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@分離|分離@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|儲存@@"
-
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|檢索@@"
-
-#~ msgid "Select Server"
-#~ msgstr "選擇伺服器"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "無法切換到 "
-
-#~ msgid "windowed"
-#~ msgstr "視窗化"
-
-#~ msgid "fullscreen"
-#~ msgstr "全螢幕"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "神秘技能"
-
-#~ msgid "Weapons"
-#~ msgstr "武器"
-
-#~ msgid "Crafts"
-#~ msgstr "工藝品"
-
-#~ msgid "Stats"
-#~ msgstr "狀態"
-
-#~ msgid "Total"
-#~ msgstr "總共"
-
-#~ msgid "Cost"
-#~ msgstr "需求"
-
-#~ msgid "Attack:"
-#~ msgstr "攻擊:"
-
-#~ msgid "% Reflex:"
-#~ msgstr "% 傷害反射："
-
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "剩餘狀態點數：%d"
-
-#~ msgid "Max level"
-#~ msgstr "最大等級"
-
-#~ msgid "curl error "
-#~ msgstr "curl 錯誤 "
-
-#~ msgid " host: "
-#~ msgstr " 主機: "
-
-#~ msgid "Guilds"
-#~ msgstr "公會"
-
-#~ msgid "Buddys"
-#~ msgstr "好友"
-
-#~ msgid "Party Window"
-#~ msgstr "隊伍視窗"
-
-#~ msgid "Unarmed"
-#~ msgstr "未命名"
-
-#~ msgid "Knife"
-#~ msgstr "小刀"
-
-#~ msgid "Sword"
-#~ msgstr "劍"
-
-#~ msgid "Polearm"
-#~ msgstr "長戰斧"
-
-#~ msgid "Staff"
-#~ msgstr "杖"
-
-#~ msgid "Whip"
-#~ msgstr "鞭子"
-
-#~ msgid "Bow"
-#~ msgstr "弓"
-
-#~ msgid "Shooting"
-#~ msgstr "射擊"
-
-#~ msgid "Mace"
-#~ msgstr "錘"
-
-#~ msgid "Axe"
-#~ msgstr "斧"
-
-#~ msgid "Thrown"
-#~ msgstr "投擲"
-
-#~ msgid "Craft"
-#~ msgstr "工藝品"
-
-#~ msgid "Unknown Skill"
-#~ msgstr "不明的技能"
-
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " 不能建立，但是它也不存在！現在結束。"
-
-#~ msgid "Couldn't set "
-#~ msgstr "無法設定 "
-
-#~ msgid " video mode: "
-#~ msgstr " 視訊模式: "
-
-#~ msgid "mana"
-#~ msgstr "mana"
-
-#~ msgid "Connecting to character server..."
-#~ msgstr "正在連接角色伺服器..."
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "正在連接帳號伺服器..."
-
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > 效果同 create 指令"
-
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "指令： /new <隊伍名稱>"
-
-#~ msgid "a"
-#~ msgstr "一個"
-
-#~ msgid "Unnamed"
-#~ msgstr "未知物品"
-
-#~ msgid "Gold: %d"
-#~ msgstr "金幣：%d"
-
-#~ msgid "%s whispers:"
-#~ msgstr "%s悄悄密你說："
-
-#~ msgid "Unknown command"
-#~ msgstr "不明指令"
-
-#~ msgid "Seems you need more Zeny... ;-)"
-#~ msgstr "你需要更多錢錢……;-)"
-
-#~ msgid "/announce: Global announcement (GM only)"
-#~ msgstr "/announce: 伺服公告（只有GM可使用）"
-
-#~ msgid "/clear: Clears this window"
-#~ msgstr "/clear: 清除視窗"
-
-#~ msgid "/help: Display this help"
-#~ msgstr "/help: 顯示幫助訊息"
-
-#~ msgid "/where: Display map name"
-#~ msgstr "/where: 顯示地圖名稱"
-
-#~ msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-#~ msgstr "/whisper <暱稱> <密語>： 發送一條私密訊息 <訊息> 給 <暱稱>"
-
-#~ msgid "/w <nick> <message>: Short form for /whisper"
-#~ msgstr "/w <暱稱> <信息>: /whisper的縮寫形式"
-
-#~ msgid "/who: Display number of online users"
-#~ msgstr "/who: 顯示線上人數"
-
-#~ msgid "Command: /whisper <nick> <msg>"
-#~ msgstr "指令： /whisper <暱稱> <信息>"
-
-#~ msgid "Command: /w <nick> <msg>"
-#~ msgstr "指令： /w <暱稱> <信息>"
-
-#~ msgid "This command sends the message <msg> to <nick>."
-#~ msgstr "這個指令發送訊息 <msg> 給 <nick>"
-
-#~ msgid "Weight: %d / %d"
-#~ msgstr "負重：%d / %d"
-
-#~ msgid "Slots used: %d / %d"
-#~ msgstr "已使用攔： %d / %d"
-
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@撿起|撿起%s@@"
-
-#~ msgid "Save player list"
-#~ msgstr "保存玩家列表"
-
-#~ msgid "Scroll radius"
-#~ msgstr "捲動半徑"
-
-#~ msgid "Scroll laziness"
-#~ msgstr "捲動延遲"
-
-#~ msgid "Money: %d GP"
-#~ msgstr "金錢：%d 金錢"
-
-#~ msgid "Confirm"
-#~ msgstr "確認"
-
-#~ msgid "Charisma:"
-#~ msgstr "魅力:"
-
-#~ msgid "Total Weight: %d - Maximum Weight: %d"
-#~ msgstr "目前的負責：%d - 最大負重：%d"
-
-#~ msgid "Keep"
-#~ msgstr "保持"
-
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
-
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
-
-#~ msgid " cancelled"
-#~ msgstr " 已取消"
-
-#~ msgid "Emote"
-#~ msgstr "表情"
-
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> 取消\n"
-
-#~ msgid "Other Player's Names"
-#~ msgstr "其他玩家的名字"
-
-#~ msgid "Shirt"
-#~ msgstr "襯衫"
-
-#~ msgid "Usable"
-#~ msgstr "可使用"
+msgid "Intelligence %+d"
+msgstr "智力 %+d"
 
-#~ msgid "Hat"
-#~ msgstr "帽子"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "閃躲 %+d"
 
-#~ msgid "Ring"
-#~ msgstr "指環"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "幸運  %+d"
 
-#~ msgid "Necklace"
-#~ msgstr "項鍊"
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr ""
 
-#~ msgid "Shield"
-#~ msgstr "盾牌"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr ""
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
 
-#~ msgid "use"
-#~ msgstr "使用"
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr ""
 
-#~ msgid "%s: %s"
-#~ msgstr "%s： %s"
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr ""
 
-#~ msgid "Emote Window"
-#~ msgstr "表情視窗"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr ""
 
-#~ msgid "Options: "
-#~ msgstr "選項: "
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "  -h --help       : Display this help"
-#~ msgstr "  -h --help : 顯示這個說明"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "和伺服器失去連線"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr "  -D --default : 以預設的設定值跳過登入程序"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "幸運"
 
-#~ msgid "  -d --data       : Directory to load game data from"
-#~ msgstr "  -d --data       : 用來載入遊戲資料的目錄"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr ""
 
-#~ msgid "  -C --configfile : Configuration file to use"
-#~ msgstr "  -C --configfile : 要使用的組態檔案"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-#~ msgid "  -u --skipupdate : Skip the update downloads"
-#~ msgstr "  -u --skipupdate : 略過更新的下載"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "  -v --version    : Display the version"
-#~ msgstr "  -v --version : 顯示版本"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
 
-#~ msgid "  -o --port       : Login Server Port"
-#~ msgstr "  -o --port : 登入伺服器連接埠"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr ""
 
-#~ msgid "  -c --character  : Login with this character"
-#~ msgstr "  -c --character : 以這個角色登入"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr ""
 
-#~ msgid "  -s --server     : Login Server name or IP"
-#~ msgstr "  -s --server  : 登入伺服器名稱或 IP"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr ""
 
-#~ msgid "  -H --updatehost : Use this update host"
-#~ msgstr "  -H --updatehost : 使用這個更新主機"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr ""
 
-#~ msgid "  -S --homedir    : Directory to use as home directory"
-#~ msgstr "  -S --homedir : 做為家目錄的目錄"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr ""
 
-#~ msgid "  -P --password   : Login with this password"
-#~ msgstr "  -P --password : 以這個密碼登入"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#~ msgid "  -U --username   : Login with this username"
-#~ msgstr "  -U --username : 以這個使用者名稱登入"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid "Luck: %d"
-#~ msgstr "幸運: %d"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr ""
 
-#~ msgid "Intelligence: %d"
-#~ msgstr "智力: %d"
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s 不在您的隊伍中！"
 
-#~ msgid "Strength: %d"
-#~ msgstr "力量: %d"
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "You picked up %s [%s]"
-#~ msgstr "您已經撿起 %s [%s]"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "NPC Text Request"
-#~ msgstr "NPC 文字要求"
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Insert coin to continue"
-#~ msgstr "投入硬幣接關"
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "Willpower: %d"
-#~ msgstr "意志力: %d"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "未知物品"
 
-#~ msgid "Cannont send empty whispers!"
-#~ msgstr "不能送出空的悄悄話！"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "攻擊 %+d"
 
-#~ msgid ""
-#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or "
-#~ "is you."
-#~ msgstr "不能建立 nick 「%s」的悄悄話分頁！它已經存在，或者對象是你自己。"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "防禦 %+d"
 
-#~ msgid "Generic"
-#~ msgstr "一般"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "體力%+d"
 
-#~ msgid "Slots: "
-#~ msgstr "欄位: "
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "魔力%+d"
 
-#~ msgid "Agility: %d"
-#~ msgstr "敏捷: %d"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "不明的物品"
 
-#~ msgid "Dexterity: %d"
-#~ msgstr "閃躲: %d"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "無法讀取所選擇png圖檔"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d230c18f..413a72f65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -181,6 +181,8 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/scrollarea.cpp
     gui/widgets/scrollarea.h
+    gui/widgets/setupitem.cpp
+    gui/widgets/setupitem.h
     gui/widgets/setuptab.cpp
     gui/widgets/setuptab.h
     gui/widgets/setuptabscroll.cpp
@@ -197,8 +199,8 @@ SET(SRCS
     gui/widgets/tab.h
     gui/widgets/tabbedarea.cpp
     gui/widgets/tabbedarea.h
-    gui/widgets/table.cpp
-    gui/widgets/table.h
+    gui/widgets/guitable.cpp
+    gui/widgets/guitable.h
     gui/widgets/tablemodel.cpp
     gui/widgets/tablemodel.h
     gui/widgets/textbox.cpp
@@ -267,8 +269,8 @@ SET(SRCS
     gui/logindialog.h
     gui/minimap.cpp
     gui/minimap.h
-    gui/ministatus.cpp
-    gui/ministatus.h
+    gui/ministatuswindow.cpp
+    gui/ministatuswindow.h
     gui/npcdialog.cpp
     gui/npcdialog.h
     gui/npcpostdialog.cpp
@@ -299,8 +301,6 @@ SET(SRCS
     gui/serverdialog.h
     gui/setup.cpp
     gui/setup.h
-    gui/setupitem.cpp
-    gui/setupitem.h
     gui/setup_audio.cpp
     gui/setup_audio.h
     gui/setup_colors.cpp
@@ -315,6 +315,10 @@ SET(SRCS
     gui/setup_chat.h
     gui/setup_keyboard.cpp
     gui/setup_keyboard.h
+    gui/setup_perfomance.cpp
+    gui/setup_perfomance.h
+    gui/setup_relations.cpp
+    gui/setup_relations.h
     gui/setup_players.cpp
     gui/setup_players.h
     gui/setup_video.cpp
@@ -345,8 +349,8 @@ SET(SRCS
     gui/tradewindow.h
     gui/unregisterdialog.cpp
     gui/unregisterdialog.h
-    gui/updatewindow.cpp
-    gui/updatewindow.h
+    gui/updaterwindow.cpp
+    gui/updaterwindow.h
     gui/userpalette.cpp
     gui/userpalette.h
     gui/viewport.cpp
@@ -468,8 +472,8 @@ SET(SRCS
     being.h
     spellmanager.cpp
     spellmanager.h
-    chatlog.cpp
-    chatlog.h
+    chatlogger.cpp
+    chatlogger.h
     client.cpp
     client.h
     channel.cpp
@@ -528,8 +532,8 @@ SET(SRCS
     listener.h
     localplayer.cpp
     localplayer.h
-    log.cpp
-    log.h
+    logger.cpp
+    logger.h
     main.cpp
     main.h
     map.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 18ae560b8..57bb4e620 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -184,6 +184,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/widgets/scrollarea.cpp \
 	      gui/widgets/scrollarea.h \
+	      gui/widgets/setupitem.cpp \
+	      gui/widgets/setupitem.h \
 	      gui/widgets/setuptab.cpp \
 	      gui/widgets/setuptab.h \
 	      gui/widgets/setuptabscroll.cpp \
@@ -200,8 +202,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tab.h \
 	      gui/widgets/tabbedarea.cpp \
 	      gui/widgets/tabbedarea.h \
-	      gui/widgets/table.cpp \
-	      gui/widgets/table.h \
+	      gui/widgets/guitable.cpp \
+	      gui/widgets/guitable.h \
 	      gui/widgets/tablemodel.cpp \
 	      gui/widgets/tablemodel.h \
 	      gui/widgets/textbox.cpp \
@@ -270,8 +272,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/logindialog.h \
 	      gui/minimap.cpp \
 	      gui/minimap.h \
-	      gui/ministatus.cpp \
-	      gui/ministatus.h \
+	      gui/ministatuswindow.cpp \
+	      gui/ministatuswindow.h \
 	      gui/npcdialog.cpp \
 	      gui/npcdialog.h \
 	      gui/npcpostdialog.cpp \
@@ -302,8 +304,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/serverdialog.h \
 	      gui/setup.cpp \
 	      gui/setup.h \
-	      gui/setupitem.cpp \
-	      gui/setupitem.h \
 	      gui/setup_audio.cpp \
 	      gui/setup_audio.h \
 	      gui/setup_colors.cpp \
@@ -318,8 +318,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/setup_chat.h \
 	      gui/setup_keyboard.cpp \
 	      gui/setup_keyboard.h \
+	      gui/setup_perfomance.cpp \
+	      gui/setup_perfomance.h \
 	      gui/setup_players.cpp \
 	      gui/setup_players.h \
+	      gui/setup_relations.cpp \
+	      gui/setup_relations.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
 	      gui/sdlfont.cpp \
@@ -348,8 +352,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/tradewindow.h \
 	      gui/unregisterdialog.cpp \
 	      gui/unregisterdialog.h \
-	      gui/updatewindow.cpp \
-	      gui/updatewindow.h \
+	      gui/updaterwindow.cpp \
+	      gui/updaterwindow.h \
 	      gui/userpalette.cpp \
 	      gui/userpalette.h \
 	      gui/viewport.cpp \
@@ -475,8 +479,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      being.h \
 	      spellmanager.cpp \
 	      spellmanager.h \
-	      chatlog.cpp \
-	      chatlog.h \
+	      chatlogger.cpp \
+	      chatlogger.h \
 	      client.cpp \
 	      client.h \
 	      channel.cpp \
@@ -535,8 +539,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      listener.h \
 	      localplayer.cpp \
 	      localplayer.h \
-	      log.cpp \
-	      log.h \
+	      logger.cpp \
+	      logger.h \
 	      main.cpp \
 	      main.h \
 	      map.cpp\
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 5f71c6bbb..848e84e0f 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -26,7 +26,7 @@
 #include "effectmanager.h"
 #include "imagesprite.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "simpleanimation.h"
 #include "sound.h"
 #include "statuseffect.h"
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 61534c340..e8244bc30 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 #include "playerinfo.h"
 #include "playerrelations.h"
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 41aabf60c..7414c94bc 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -23,7 +23,7 @@
 #include "animatedsprite.h"
 
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/being.cpp b/src/being.cpp
index 47e1f03fc..cc88d8f6e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -31,7 +31,7 @@
 #include "guild.h"
 #include "item.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "particle.h"
 #include "party.h"
@@ -196,6 +196,7 @@ bool Being::mShowOwnHP = false;
 bool Being::mShowGender = false;
 bool Being::mShowLevel = false;
 bool Being::mShowPlayersStatus = false;
+bool Being::mEnableReorderSprites = true;
 
 std::list<BeingCacheEntry*> beingInfoCache;
 
@@ -262,7 +263,7 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map):
 
     if (mType == PLAYER)
         mShowName = config.getBoolValue("visiblenames");
-    else
+    else if (mType != NPC)
         mGotComment = true;
 
     config.addListener("visiblenames", this);
@@ -475,7 +476,7 @@ void Being::setSpeech(const std::string &text, int time)
         mSpeech = mSpeech.substr(0, lineLim);
 
     trim(mSpeech);
-    if (mSpeech.length() < 1)
+    if (mSpeech.empty())
         return;
 
     if (!time && mSpeech.size() < 200)
@@ -1362,7 +1363,7 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
 
 void Being::drawSpeech(int offsetX, int offsetY)
 {
-    if (!mSpeechBubble)
+    if (!mSpeechBubble || mSpeech.empty())
         return;
 
     const int px = getPixelX() - offsetX;
@@ -1553,6 +1554,9 @@ void Being::showName()
         font = gui->getSecureFont();
     }
 
+    if (mDisplayName.empty())
+        return;
+
     mDispName = new FlashText(mDisplayName, getPixelX(), getPixelY(),
                               gcn::Graphics::CENTER, mNameColor, font);
 
@@ -1750,6 +1754,7 @@ void Being::reReadConfig()
         mShowGender = config.getBoolValue("showgender");
         mShowLevel = config.getBoolValue("showlevel");
         mShowPlayersStatus = config.getBoolValue("showPlayersStatus");
+        mEnableReorderSprites = config.getBoolValue("enableReorderSprites");
 
         mUpdateConfigTime = cur_time;
     }
@@ -2034,14 +2039,28 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage,
 
     int dx = static_cast<int>(static_cast<float>(width) / p);
 
+    if (!damage || (!hp && maxHP == damage))
+    {
+        graphics->setColor(userPalette->getColorWithAlpha(color1));
+
+        graphics->fillRectangle(gcn::Rectangle(
+            x, y, dx, height));
+        return;
+    }
+    else if (width - dx <= 0)
+    {
+        graphics->setColor(userPalette->getColorWithAlpha(color2));
+
+        graphics->fillRectangle(gcn::Rectangle(
+            x, y, width, height));
+        return;
+    }
+
     graphics->setColor(userPalette->getColorWithAlpha(color1));
 
     graphics->fillRectangle(gcn::Rectangle(
         x, y, dx, height));
 
-    if (width - dx <= 0)
-        return;
-
     graphics->setColor(userPalette->getColorWithAlpha(color2));
 
     graphics->fillRectangle(gcn::Rectangle(
@@ -2073,6 +2092,9 @@ void Being::resetCounters()
 
 void Being::recalcSpritesOrder()
 {
+    if (!mEnableReorderSprites)
+        return;
+
 //    logger->log("recalcSpritesOrder");
     unsigned sz = static_cast<unsigned>(size());
     if (sz < 1)
@@ -2358,13 +2380,26 @@ void Being::updateComment()
         return;
 
     mGotComment = true;
-    mComment = loadComment(mName);
+    mComment = loadComment(mName, mType);
 }
 
-std::string Being::loadComment(const std::string &name)
+std::string Being::loadComment(const std::string &name, int type)
 {
-    std::string str = Client::getUsersDirectory()
-        + stringToHexPath(name) + "/comment.txt";
+    std::string str;
+    switch (type)
+    {
+        case PLAYER:
+            str = Client::getUsersDirectory();
+            break;
+        case NPC:
+            str = Client::getNpcsDirectory();
+            break;
+        default:
+            return "";
+    }
+
+    str += stringToHexPath(name) + "/comment.txt";
+    logger->log("load from: %s", str.c_str());
     std::vector<std::string> lines;
 
     ResourceManager *resman = ResourceManager::getInstance();
@@ -2378,10 +2413,22 @@ std::string Being::loadComment(const std::string &name)
 }
 
 void Being::saveComment(const std::string &name,
-                        const std::string &comment)
+                        const std::string &comment, int type)
 {
-    std::string dir = Client::getUsersDirectory()
-        + stringToHexPath(name);
+    std::string dir;
+    switch (type)
+    {
+        case PLAYER:
+            dir = Client::getUsersDirectory();
+            break;
+        case NPC:
+            dir = Client::getNpcsDirectory();
+            break;
+        default:
+            return;
+    }
+    dir += stringToHexPath(name);
+    logger->log("save to: %s", dir.c_str());
     ResourceManager *resman = ResourceManager::getInstance();
     resman->saveTextFile(dir, "comment.txt", name + "\n" + comment);
 }
diff --git a/src/being.h b/src/being.h
index 092e324e4..2c37ffeb5 100644
--- a/src/being.h
+++ b/src/being.h
@@ -741,10 +741,10 @@ class Being : public ActorSprite, public ConfigListener
 
         static void clearCache();
 
-        static std::string loadComment(const std::string &name);
+        static std::string loadComment(const std::string &name, int type);
 
         static void saveComment(const std::string &name,
-                                const std::string &comment);
+                                const std::string &comment, int type);
 
         bool isAdvanced()
         { return mAdvanced; }
@@ -873,6 +873,7 @@ class Being : public ActorSprite, public ConfigListener
         static bool mShowGender;
         static bool mShowLevel;
         static bool mShowPlayersStatus;
+        static bool mEnableReorderSprites;
 
         unsigned int mMoveTime;
         unsigned int mAttackTime;
diff --git a/src/chatlog.cpp b/src/chatlogger.cpp
index b0ff14479..067265138 100644
--- a/src/chatlog.cpp
+++ b/src/chatlogger.cpp
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011  The ManaPlus Developers
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "chatlog.h"
+#include "chatlogger.h"
 
 #include <iostream>
 #include <sstream>
@@ -37,7 +37,7 @@
 #include <Carbon/Carbon.h>
 #endif
 
-#include "log.h"
+#include "logger.h"
 #include "configuration.h"
 
 #include "utils/stringutils.h"
diff --git a/src/chatlog.h b/src/chatlogger.h
index c3e8b2e27..6e096ac89 100644
--- a/src/chatlog.h
+++ b/src/chatlogger.h
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009-2010  The Mana Developers
  *  Copyright (C) 2011  The ManaPlus Developers
  *  Copyright (C) 2009-2010  Andrei Karas
  *
- *  This file is part of The Mana World.
+ *  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
@@ -21,8 +21,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef M_CHATLOG_H
-#define M_CHATLOG_H
+#ifndef M_CHATLOGGER_H
+#define M_CHATLOGGER_H
 
 #include <fstream>
 #include <list>
diff --git a/src/client.cpp b/src/client.cpp
index 01543d8be..0e871ed91 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include "main.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "configuration.h"
 #include "dropshortcut.h"
 #include "emoteshortcut.h"
@@ -61,7 +61,7 @@
 #include "gui/setup.h"
 #include "gui/theme.h"
 #include "gui/unregisterdialog.h"
-#include "gui/updatewindow.h"
+#include "gui/updaterwindow.h"
 #include "gui/userpalette.h"
 #include "gui/worldselectdialog.h"
 
@@ -240,6 +240,7 @@ Client::Client(const Options &options):
     mOptions(options),
     mServerConfigDir(""),
     mUsersDir(""),
+    mNpcsDir(""),
     mRootDir(""),
     mCurrentDialog(0),
     mQuitDialog(0),
@@ -1289,8 +1290,6 @@ int Client::exec()
                 case STATE_ERROR:
                     logger->log1("State: ERROR");
                     logger->log("Error: %s\n", errorMessage.c_str());
-                    if (chatWindow)
-                        chatWindow->saveState();
                     mCurrentDialog = new OkDialog(_("Error"), errorMessage);
                     mCurrentDialog->addActionListener(&errorListener);
                     mCurrentDialog = NULL; // OkDialog deletes itself
@@ -1803,6 +1802,7 @@ void Client::storeSafeParameters()
     std::string particleFont;
     std::string helpFont;
     std::string secureFont;
+    std::string japanFont;
     bool showBackground;
     bool enableMumble;
     bool enableMapReduce;
@@ -1830,6 +1830,7 @@ void Client::storeSafeParameters()
     particleFont = config.getStringValue("particleFont");
     helpFont = config.getStringValue("helpFont");
     secureFont = config.getStringValue("secureFont");
+    japanFont = config.getStringValue("japanFont");
 
     showBackground = config.getBoolValue("showBackground");
     enableMumble = config.getBoolValue("enableMumble");
@@ -1848,6 +1849,7 @@ void Client::storeSafeParameters()
     config.setValue("particleFont", "fonts/dejavusans.ttf");
     config.setValue("helpFont", "fonts/dejavusansmono.ttf");
     config.setValue("secureFont", "fonts/dejavusansmono.ttf");
+    config.setValue("japanFont", "fonts/mplus-1p-regular.ttf");
     config.setValue("showBackground", false);
     config.setValue("enableMumble", false);
     config.setValue("enableMapReduce", false);
@@ -1873,6 +1875,7 @@ void Client::storeSafeParameters()
     config.setValue("particleFont", particleFont);
     config.setValue("helpFont", helpFont);
     config.setValue("secureFont", secureFont);
+    config.setValue("japanFont", japanFont);
     config.setValue("showBackground", showBackground);
     config.setValue("enableMumble", enableMumble);
     config.setValue("enableMapReduce", enableMapReduce);
@@ -1919,6 +1922,13 @@ void Client::initUsersDir()
         logger->error(strprintf(_("%s doesn't exist and can't be created! "
             "Exiting."), mUsersDir.c_str()));
     }
+
+    mNpcsDir = Client::getServerConfigDirectory() + "/npcs/";
+    if (mkdir_r(mNpcsDir.c_str()))
+    {
+        logger->error(strprintf(_("%s doesn't exist and can't be created! "
+            "Exiting."), mNpcsDir.c_str()));
+    }
 }
 
 void Client::initPacketLimiter()
@@ -2139,6 +2149,11 @@ const std::string Client::getUsersDirectory()
     return instance()->mUsersDir;
 }
 
+const std::string Client::getNpcsDirectory()
+{
+    return instance()->mNpcsDir;
+}
+
 void Client::setGuiAlpha(float n)
 {
     instance()->mGuiAlpha = n;
diff --git a/src/client.h b/src/client.h
index 75b3c03fe..986e06cfb 100644
--- a/src/client.h
+++ b/src/client.h
@@ -226,6 +226,8 @@ public:
 
     static const std::string getUsersDirectory();
 
+    static const std::string getNpcsDirectory();
+
     static bool getIsMinimized()
     { return instance()->mIsMinimized; }
 
@@ -303,6 +305,7 @@ private:
     std::string mScreenshotDir;
     std::string mServerConfigDir;
     std::string mUsersDir;
+    std::string mNpcsDir;
     std::string mRootDir;
     std::string mServerName;
 
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index b87dcf583..f650ac8d1 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -27,7 +27,7 @@
 #include "channel.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "gui/chatwindow.h"
@@ -403,8 +403,14 @@ void CommandHandler::handleMsg(const std::string &args, ChatTab *tab)
 
 void CommandHandler::handleQuery(const std::string &args, ChatTab *tab)
 {
-    if (chatWindow && chatWindow->addWhisperTab(args, true))
-        return;
+    if (chatWindow)
+    {
+        if (chatWindow->addWhisperTab(args, true))
+        {
+            chatWindow->saveState();
+            return;
+        }
+    }
 
     tab->chatLog(strprintf(_("Cannot create a whisper tab for nick \"%s\"! "
         "It either already exists, or is you."),
@@ -736,14 +742,20 @@ void CommandHandler::handleCloseAll(const std::string &args A_UNUSED,
                                     ChatTab *tab A_UNUSED)
 {
     if (chatWindow)
+    {
         chatWindow->removeAllWhispers();
+        chatWindow->saveState();
+    }
 }
 
 void CommandHandler::handleIgnoreAll(const std::string &args A_UNUSED,
                                      ChatTab *tab A_UNUSED)
 {
     if (chatWindow)
+    {
         chatWindow->ignoreAllWhispers();
+        chatWindow->saveState();
+    }
 }
 
 void CommandHandler::handleOutfit(const std::string &args,
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 1642416ea..99fae4f88 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -21,6 +21,7 @@
 
 #include "compoundsprite.h"
 
+#include "configuration.h"
 #include "game.h"
 #include "graphics.h"
 #ifdef USE_OPENGL
@@ -52,6 +53,9 @@ CompoundSprite::CompoundSprite():
         mNeedsRedraw(false)
 {
     mAlpha = 1.0f;
+    mEnableAlphaFix = config.getBoolValue("enableAlphaFix");
+    mDisableAdvBeingCaching = config.getBoolValue("disableAdvBeingCaching");
+    mDisableBeingCaching = config.getBoolValue("disableBeingCaching");
 }
 
 CompoundSprite::~CompoundSprite()
@@ -406,7 +410,7 @@ void CompoundSprite::setAlpha(float alpha)
 {
     if (alpha != mAlpha)
     {
-        if (Image::mUseOpenGL == 0 && size() > 3)
+        if (mEnableAlphaFix && Image::mUseOpenGL == 0 && size() > 3)
         {
             SpriteConstIterator it, it_end;
             for (it = begin(), it_end = end(); it != it_end; ++ it)
@@ -426,18 +430,28 @@ void CompoundSprite::updateImages() const
         return;
 #endif
 
-    if (size() <= 3)
-        return;
-
     mNeedsRedraw = false;
 
-    if (updateFromCache())
-        return;
+    if (!mDisableBeingCaching)
+    {
+        if (size() <= 3)
+            return;
+
+        if (!mDisableAdvBeingCaching)
+        {
+            if (updateFromCache())
+                return;
 
-    redraw();
+            redraw();
 
-    if (mImage)
-        initCurrentCacheItem();
+            if (mImage)
+                initCurrentCacheItem();
+        }
+        else
+        {
+            redraw();
+        }
+    }
 }
 
 bool CompoundSprite::updateFromCache() const
diff --git a/src/compoundsprite.h b/src/compoundsprite.h
index 0841bcfb8..2211cb80c 100644
--- a/src/compoundsprite.h
+++ b/src/compoundsprite.h
@@ -135,6 +135,10 @@ private:
     mutable int mOffsetX, mOffsetY;
 
     mutable bool mNeedsRedraw;
+
+    bool mEnableAlphaFix;
+    bool mDisableAdvBeingCaching;
+    bool mDisableBeingCaching;
 };
 
 #endif // COMPOUNDSPRITE_H
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7d1f41fe5..2524d6b93 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -23,7 +23,7 @@
 #include "configuration.h"
 
 #include "configlistener.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/paths.h"
 #include "utils/stringutils.h"
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 7b5f5255a..16f4620d4 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -159,6 +159,7 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "particleFont", "fonts/dejavusans.ttf");
     AddDEF(configData, "helpFont", "fonts/dejavusansmono.ttf");
     AddDEF(configData, "secureFont", "fonts/dejavusansmono.ttf");
+    AddDEF(configData, "japanFont", "fonts/mplus-1p-regular.ttf");
     AddDEF(configData, "showBackground", true);
     AddDEF(configData, "enableTradeTab", true);
     AddDEF(configData, "logToChat", false);
@@ -167,9 +168,9 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "floorItemsHighlight", true);
     AddDEF(configData, "enableBotCheker", true);
     AddDEF(configData, "removeColors", true);
-    AddDEF(configData, "showMagicInDebug", false);
+    AddDEF(configData, "showMagicInDebug", true);
     AddDEF(configData, "allowCommandsInChatTabs", true);
-    AddDEF(configData, "serverMsgInDebug", false);
+    AddDEF(configData, "serverMsgInDebug", true);
     AddDEF(configData, "hideShopMessages", true);
     AddDEF(configData, "showChatHistory", true);
     AddDEF(configData, "showChatColorsList", true);
@@ -210,6 +211,11 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "showPlayersStatus", true);
     AddDEF(configData, "beingopacity", false);
     AddDEF(configData, "adjustPerfomance", true);
+    AddDEF(configData, "enableAlphaFix", false);
+    AddDEF(configData, "disableAdvBeingCaching", false);
+    AddDEF(configData, "disableBeingCaching", false);
+    AddDEF(configData, "enableReorderSprites", true);
+    AddDEF(configData, "showip", false);
     return configData;
 }
 
@@ -237,6 +243,7 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "particleFont", "fonts/dejavusans.ttf");
     AddDEF(brandingData, "helpFont", "fonts/dejavusansmono.ttf");
     AddDEF(brandingData, "secureFont", "fonts/dejavusansmono.ttf");
+    AddDEF(brandingData, "japanFont", "fonts/mplus-1p-regular.ttf");
 
     AddDEF(brandingData, "guiPath", "graphics/gui/");
     AddDEF(brandingData, "guiThemePath", "themes/");
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index ef67fca12..48eed92bc 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/dropshortcut.h b/src/dropshortcut.h
index ffaf40ccf..31c20677d 100644
--- a/src/dropshortcut.h
+++ b/src/dropshortcut.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index bb54ced99..36e7aac16 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -21,7 +21,7 @@
 
 #include "being.h"
 #include "effectmanager.h"
-#include "log.h"
+#include "logger.h"
 #include "particle.h"
 #include "sound.h"
 
diff --git a/src/filefilter.txt b/src/filefilter.txt
index b2b1e7d0c..0dde8e90c 100644
--- a/src/filefilter.txt
+++ b/src/filefilter.txt
@@ -1,5 +1,6 @@
 ~ RULE_3_1_A_do_not_start_filename_with_underbar
 ~ RULE_3_2_CD_do_not_use_special_characters_in_filename
+~ RULE_3_2_F_use_representitive_classname_for_cpp_filename
 ~ RULE_3_2_H_do_not_use_uppercase_for_c_filename
 ~ RULE_3_3_A_start_function_name_with_lowercase_unix
 ~ RULE_4_1_A_B_use_space_for_indentation
@@ -23,3 +24,4 @@
 ~ RULE_8_1_A_provide_file_info_comment
 ~ RULE_9_1_A_do_not_use_hardcorded_include_path
 ~ RULE_9_2_D_use_reentrant_function
+
diff --git a/src/game.cpp b/src/game.cpp
index 9a5128f37..82f919976 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -42,7 +42,7 @@
 #include "joystick.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "particle.h"
 #include "playerrelations.h"
@@ -60,7 +60,7 @@
 #include "gui/inventorywindow.h"
 #include "gui/killstats.h"
 #include "gui/minimap.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 #include "gui/npcpostdialog.h"
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
@@ -338,7 +338,8 @@ Game::Game():
     mValidSpeed(true),
     mLastAction(0),
     mNextAdjustTime(cur_time + adjustDelay),
-    mAdjustLevel(0)
+    mAdjustLevel(0),
+    mLowerCounter(0)
 {
     spellManager = new SpellManager;
     spellShortcut = new SpellShortcut;
@@ -431,8 +432,20 @@ Game::~Game()
 static bool saveScreenshot()
 {
     static unsigned int screenshotCount = 0;
+    SDL_Surface *screenshot = 0;
+
+    if (!config.getBoolValue("showip"))
+    {
+        graphics->setSecure(true);
+        gui->draw();
+        screenshot = graphics->getScreenshot();
+        graphics->setSecure(false);
+    }
+    else
+    {
+        screenshot = graphics->getScreenshot();
+    }
 
-    SDL_Surface *screenshot = graphics->getScreenshot();
     if (!screenshot)
         return false;
 
@@ -532,8 +545,6 @@ void Game::logic()
                     map->saveExtraLayer();
             }
             Client::closeDialogs();
-            if (chatWindow)
-                chatWindow->saveState();
             disconnectedDialog = new OkDialog(_("Network Error"),
                                               errorMessage, false);
             disconnectedDialog->addActionListener(&errorListener);
@@ -558,7 +569,7 @@ void Game::adjustPerfomance()
     {
         mNextAdjustTime = cur_time + adjustDelay;
     }
-    else if (mNextAdjustTime < cur_time)
+    else if (mNextAdjustTime < (unsigned)cur_time)
     {
         mNextAdjustTime = cur_time + adjustDelay;
 
@@ -576,6 +587,13 @@ void Game::adjustPerfomance()
 
         if (fps < maxFps - 10)
         {
+            if (mLowerCounter < 2)
+            {
+                mLowerCounter ++;
+                mNextAdjustTime = cur_time + 1;
+                return;
+            }
+            mLowerCounter = 0;
             mAdjustLevel ++;
             switch (mAdjustLevel)
             {
@@ -594,6 +612,7 @@ void Game::adjustPerfomance()
                     else
                     {
                         mNextAdjustTime = cur_time + 1;
+                        mLowerCounter = 2;
                     }
                     break;
                 }
@@ -611,6 +630,7 @@ void Game::adjustPerfomance()
                     else
                     {
                         mNextAdjustTime = cur_time + 1;
+                        mLowerCounter = 2;
                     }
                     break;
                 case 3:
@@ -1041,174 +1061,184 @@ void Game::handleInput()
             if (keyboard.isEnabled()
                 && !chatWindow->isInputFocused()
                 && !NpcDialog::isAnyInputFocused()
-                && !setupWindow->isVisible()
                 && !player_node->getAwayMode()
                 && !keyboard.isKeyActive(keyboard.KEY_TARGET))
             {
                 const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
 
-                // Do not activate shortcuts if tradewindow is visible
-                if (itemShortcutWindow && !tradeWindow->isVisible()
-                    && !setupWindow->isVisible())
+                if (setupWindow->isVisible())
                 {
-                    int num = itemShortcutWindow->getTabIndex();
-                    if (num >= 0 && num < SHORTCUT_TABS)
+                    if (tKey == KeyboardConfig::KEY_WINDOW_SETUP)
                     {
-                        // Checks if any item shortcut is pressed.
-                        for (int i = KeyboardConfig::KEY_SHORTCUT_1;
-                                 i <= KeyboardConfig::KEY_SHORTCUT_20;
-                                 i++)
+                        setupWindow->doCancel();
+                        used = true;
+                    }
+                }
+                else
+                {
+                    // Do not activate shortcuts if tradewindow is visible
+                    if (itemShortcutWindow && !tradeWindow->isVisible()
+                        && !setupWindow->isVisible())
+                    {
+                        int num = itemShortcutWindow->getTabIndex();
+                        if (num >= 0 && num < SHORTCUT_TABS)
                         {
-                            if (tKey == i && !used)
+                            // Checks if any item shortcut is pressed.
+                            for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+                                 i <= KeyboardConfig::KEY_SHORTCUT_20;
+                                 i ++)
                             {
-                                itemShortcut[num]->useItem(
-                                    i - KeyboardConfig::KEY_SHORTCUT_1);
-                                break;
+                                if (tKey == i && !used)
+                                {
+                                    itemShortcut[num]->useItem(
+                                        i - KeyboardConfig::KEY_SHORTCUT_1);
+                                    break;
+                                }
                             }
                         }
                     }
-                }
 
-                switch (tKey)
-                {
-                    case KeyboardConfig::KEY_PICKUP:
-                        player_node->pickUpItems();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_SIT:
-                        // Player sit action
-                        if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
-                            player_node->updateSit();
-                        else
-                            player_node->toggleSit();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_HIDE_WINDOWS:
-                        // Hide certain windows
-                        if (!chatWindow->isInputFocused())
-                        {
-                            statusWindow->setVisible(false);
-                            inventoryWindow->setVisible(false);
-                            shopWindow->setVisible(false);
-                            skillDialog->setVisible(false);
-                            setupWindow->setVisible(false);
-                            equipmentWindow->setVisible(false);
-                            helpWindow->setVisible(false);
-                            debugWindow->setVisible(false);
-                            outfitWindow->setVisible(false);
-                            dropShortcutWindow->setVisible(false);
-                            spellShortcutWindow->setVisible(false);
-                            botCheckerWindow->setVisible(false);
-                            socialWindow->setVisible(false);
-                        }
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_STATUS:
-                        requestedWindow = statusWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                        requestedWindow = inventoryWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SHOP:
-                        requestedWindow = shopWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                        requestedWindow = equipmentWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SKILL:
-                        requestedWindow = skillDialog;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_KILLS:
-                        requestedWindow = killStats;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                        minimap->toggle();
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_CHAT:
-                        requestedWindow = chatWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                        requestedWindow = itemShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SETUP:
-                        requestedWindow = setupWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_DEBUG:
-                        requestedWindow = debugWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SOCIAL:
-                        requestedWindow = socialWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
-                        requestedWindow = emoteShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_OUTFIT:
-                        requestedWindow = outfitWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_DROP:
-                        requestedWindow = dropShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SPELLS:
-                        requestedWindow = spellShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_BOT_CHECKER:
-                        requestedWindow = botCheckerWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_ONLINE:
-                        requestedWindow = whoIsOnline;
-                        break;
-                    case KeyboardConfig::KEY_SCREENSHOT:
-                        // Screenshot (picture, hence the p)
-                        saveScreenshot();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_PATHFIND:
-                        // Find path to mouse (debug purpose)
-                        if (!player_node->getDisableGameModifiers())
-                        {
-                            if (viewport)
-                                viewport->toggleDebugPath();
-                            if (miniStatusWindow)
-                                miniStatusWindow->updateStatus();
-                            if (mCurrentMap)
-                                mCurrentMap->redrawMap();
-                            used = true;
-                        }
-                        break;
-                    case KeyboardConfig::KEY_TRADE:
+                    switch (tKey)
                     {
-                        // Toggle accepting of incoming trade requests
-                        unsigned int deflt = player_relations.getDefault();
-                        if (deflt & PlayerRelation::TRADE)
-                        {
-                            localChatTab->chatLog(
-                                        _("Ignoring incoming trade requests"),
-                                        BY_SERVER);
-                            deflt &= ~PlayerRelation::TRADE;
-                        }
-                        else
+                        case KeyboardConfig::KEY_PICKUP:
+                            player_node->pickUpItems();
+                            used = true;
+                            break;
+                        case KeyboardConfig::KEY_SIT:
+                            // Player sit action
+                            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+                                player_node->updateSit();
+                            else
+                                player_node->toggleSit();
+                            used = true;
+                            break;
+                        case KeyboardConfig::KEY_HIDE_WINDOWS:
+                            // Hide certain windows
+                            if (!chatWindow->isInputFocused())
+                            {
+                                statusWindow->setVisible(false);
+                                inventoryWindow->setVisible(false);
+                                shopWindow->setVisible(false);
+                                skillDialog->setVisible(false);
+                                setupWindow->setVisible(false);
+                                equipmentWindow->setVisible(false);
+                                helpWindow->setVisible(false);
+                                debugWindow->setVisible(false);
+                                outfitWindow->setVisible(false);
+                                dropShortcutWindow->setVisible(false);
+                                spellShortcutWindow->setVisible(false);
+                                botCheckerWindow->setVisible(false);
+                                socialWindow->setVisible(false);
+                            }
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_STATUS:
+                            requestedWindow = statusWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                            requestedWindow = inventoryWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SHOP:
+                            requestedWindow = shopWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                            requestedWindow = equipmentWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SKILL:
+                            requestedWindow = skillDialog;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_KILLS:
+                            requestedWindow = killStats;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                            minimap->toggle();
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_CHAT:
+                            requestedWindow = chatWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                            requestedWindow = itemShortcutWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SETUP:
+                            requestedWindow = setupWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_DEBUG:
+                            requestedWindow = debugWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SOCIAL:
+                            requestedWindow = socialWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+                            requestedWindow = emoteShortcutWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_OUTFIT:
+                            requestedWindow = outfitWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_DROP:
+                            requestedWindow = dropShortcutWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SPELLS:
+                            requestedWindow = spellShortcutWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_BOT_CHECKER:
+                            requestedWindow = botCheckerWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_ONLINE:
+                            requestedWindow = whoIsOnline;
+                            break;
+                        case KeyboardConfig::KEY_SCREENSHOT:
+                            // Screenshot (picture, hence the p)
+                            saveScreenshot();
+                            used = true;
+                            break;
+                        case KeyboardConfig::KEY_PATHFIND:
+                            // Find path to mouse (debug purpose)
+                            if (!player_node->getDisableGameModifiers())
+                            {
+                                if (viewport)
+                                    viewport->toggleDebugPath();
+                                if (miniStatusWindow)
+                                    miniStatusWindow->updateStatus();
+                                if (mCurrentMap)
+                                    mCurrentMap->redrawMap();
+                                used = true;
+                            }
+                            break;
+                        case KeyboardConfig::KEY_TRADE:
                         {
-                            localChatTab->chatLog(
-                                        _("Accepting incoming trade requests"),
-                                        BY_SERVER);
-                            deflt |= PlayerRelation::TRADE;
-                        }
+                            // Toggle accepting of incoming trade requests
+                            unsigned int deflt = player_relations.getDefault();
+                            if (deflt & PlayerRelation::TRADE)
+                            {
+                                localChatTab->chatLog(
+                                    _("Ignoring incoming trade requests"),
+                                    BY_SERVER);
+                                deflt &= ~PlayerRelation::TRADE;
+                            }
+                            else
+                            {
+                                localChatTab->chatLog(
+                                    _("Accepting incoming trade requests"),
+                                    BY_SERVER);
+                                deflt |= PlayerRelation::TRADE;
+                            }
 
-                        player_relations.setDefault(deflt);
+                            player_relations.setDefault(deflt);
 
-                        used = true;
+                            used = true;
+                        }
+                            break;
+                        default:
+                            break;
                     }
-                        break;
-                    default:
-                        break;
                 }
-            }
 
-            if (requestedWindow)
-            {
-                requestedWindow->setVisible(!requestedWindow->isVisible());
-                if (requestedWindow->isVisible())
-                    requestedWindow->requestMoveToTop();
-                used = true;
+                if (requestedWindow)
+                {
+                    requestedWindow->setVisible(!requestedWindow->isVisible());
+                    if (requestedWindow->isVisible())
+                        requestedWindow->requestMoveToTop();
+                    used = true;
+                }
             }
         }
         // Active event
diff --git a/src/game.h b/src/game.h
index 88dc9166b..84dca08e9 100644
--- a/src/game.h
+++ b/src/game.h
@@ -117,6 +117,7 @@ class Game
         unsigned mNextAdjustTime;
         int mAdjustLevel;
         bool mAdjustPerfomance;
+        int mLowerCounter;
 
         static Game *mInstance;
 };
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 6a6760c36..c5dc38b72 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -25,7 +25,7 @@
 #include "graphics.h"
 
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 
 #include "resources/image.h"
@@ -48,7 +48,8 @@ Graphics::Graphics():
     mHWAccel(false),
     mBlitMode(BLIT_NORMAL),
     mRedraw(false),
-    mDoubleBuffer(false)
+    mDoubleBuffer(false),
+    mSecure(false)
 {
     mRect.x = 0;
     mRect.y = 0;
diff --git a/src/graphics.h b/src/graphics.h
index 237d16dc2..a2e25b5a8 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -269,6 +269,12 @@ class Graphics : public gcn::SDLGraphics
         bool getRedraw()
         { return mRedraw; }
 
+        void setSecure(bool n)
+        { mSecure = n; }
+
+        bool getSecure()
+        { return mSecure; }
+
         int mWidth;
         int mHeight;
 
@@ -283,6 +289,7 @@ class Graphics : public gcn::SDLGraphics
         bool mRedraw;
         bool mDoubleBuffer;
         SDL_Rect mRect;
+        bool mSecure;
 };
 
 extern Graphics *graphics;
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index e5dc602a0..8d7b26c1b 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -89,6 +89,12 @@ void BeingPopup::show(int x, int y, Being *b)
 
     b->updateComment();
 
+    if (b->getType() == Being::NPC && b->getComment().empty())
+    {
+        setVisible(false);
+        return;
+    }
+
     mBeingName->setCaption(b->getName() + b->getGenderSignWithSpace());
     if (gui)
     {
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index ac845adc1..4a8f8cf0d 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -35,7 +36,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
 
 #include "actorspritemanager.h"
 #include "configuration.h"
@@ -289,7 +290,6 @@ BotCheckerWindow::BotCheckerWindow():
     }
 
     mPlayerTitleTable = new GuiTable(mPlayerTableTitleModel);
-    //mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
     mPlayerTitleTable->setHeight(1);
 
     mPlayerTableTitleModel->set(0, 0, new Label(_("Name")));
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index e378fffb0..a69781865 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index d424fff91..c24624bc2 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -23,7 +23,7 @@
 #include "gui/changeemaildialog.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/register.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index dc640841a..30012ae52 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -23,7 +23,7 @@
 #include "changepassworddialog.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/register.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 264df06e3..28c7a083c 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -26,7 +26,7 @@
 #include "game.h"
 #include "localplayer.h"
 #include "units.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/changeemaildialog.h"
 #include "gui/changepassworddialog.h"
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index c266374ef..8896ca028 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -211,10 +211,12 @@ ChatWindow::ChatWindow():
     fillCommands();
     initTradeFilter();
     loadCustomList();
+    parseHighlights();
 }
 
 ChatWindow::~ChatWindow()
 {
+    saveState();
     config.setValue("ReturnToggles", mReturnToggles);
     removeAllWhispers();
     delete mItemLinkHandler;
@@ -935,7 +937,11 @@ void ChatWindow::whisper(const std::string &nick,
     if (i != mWhispers.end())
         tab = i->second;
     else if (config.getBoolValue("whispertab"))
+    {
         tab = addWhisperTab(nick);
+        if (tab)
+            saveState();
+    }
 
     if (tab)
     {
@@ -1414,15 +1420,6 @@ void ChatWindow::loadState()
             tab->setRemoveNames((flags & 2) / 2);
             tab->setNoAway((flags & 4) / 4);
         }
-        serverConfig.deleteKey("chatWhisper" + toString(num));
-        serverConfig.deleteKey("chatWhisperFlags" + toString(num));
-        num ++;
-    }
-
-    while (num < 50)
-    {
-        serverConfig.deleteKey("chatWhisper" + toString(num));
-        serverConfig.deleteKey("chatWhisperFlags" + toString(num));
         num ++;
     }
 }
@@ -1507,7 +1504,7 @@ void ChatWindow::addToAwayLog(std::string line)
     if (mAwayLog.size() > 20)
         mAwayLog.pop_front();
 
-    if (line.find(player_node->getName()) != std::string::npos)
+    if (findI(line, mHighlights) != std::string::npos)
         mAwayLog.push_back("##9away:" + line);
 }
 
@@ -1524,3 +1521,20 @@ void ChatWindow::displayAwayLog()
         ++i;
     }
 }
+
+void ChatWindow::parseHighlights()
+{
+    mHighlights.clear();
+    if (!player_node)
+        return;
+
+    splitToStringVector(mHighlights, config.getStringValue(
+        "highlightWords"), ',');
+
+    mHighlights.push_back(player_node->getName());
+}
+
+bool ChatWindow::findHighlight(std::string &str)
+{
+    return findI(str, mHighlights) != std::string::npos;
+}
+\ No newline at end of file
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index b6a37ef79..6e1d548a3 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -260,6 +260,10 @@ class ChatWindow : public Window,
         void clearAwayLog()
         { mAwayLog.clear(); }
 
+        void parseHighlights();
+
+        bool findHighlight(std::string &str);
+
     protected:
         friend class ChatTab;
         friend class WhisperTab;
@@ -329,6 +333,7 @@ class ChatWindow : public Window,
         int mChatColor;
         unsigned int mChatHistoryIndex;
         std::list<std::string> mAwayLog;
+        std::vector<std::string> mHighlights;
 };
 
 extern ChatWindow *chatWindow;
diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp
index 157398297..da98ea5ac 100644
--- a/src/gui/connectiondialog.cpp
+++ b/src/gui/connectiondialog.cpp
@@ -22,7 +22,7 @@
 
 #include "connectiondialog.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 03188907f..4d89bd924 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/didyouknowwindow.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "gui/gui.h"
 #include "gui/setup.h"
diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp
index bb80f07ed..da1d98e81 100644
--- a/src/gui/editdialog.cpp
+++ b/src/gui/editdialog.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h
index 55947b23d..dc0d1cc63 100644
--- a/src/gui/editdialog.h
+++ b/src/gui/editdialog.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 3a754d0e3..348a97952 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -28,7 +28,7 @@
 #include "emoteshortcut.h"
 #include "graphics.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/theme.h"
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 5a2820550..3abd97c73 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -45,6 +45,7 @@
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
+#include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
@@ -55,24 +56,6 @@
 static const int BOX_WIDTH = 36;
 static const int BOX_HEIGHT = 36;
 
-// Positions of the boxes, 2nd dimension is X and Y respectively.
-static const int boxPosition[][2] =
-{
-    { 90,  40 },    // EQUIP_TORSO_SLOT
-    { 8,   78 },    // EQUIP_GLOVES_SLOT
-    { 70,  0 },     // EQUIP_HEAD_SLOT
-    { 50,  253 },   // EQUIP_LEGS_SLOT
-    { 90,  253 },   // EQUIP_FEET_SLOT
-    { 8,   213 },   // EQUIP_RING1_SLOT
-    { 129, 213 },   // EQUIP_RING2_SLOT
-    { 50,  40 },    // EQUIP_NECK_SLOT
-    { 8,   168 },   // EQUIP_FIGHT1_SLOT
-    { 129, 168 },   // EQUIP_FIGHT2_SLOT
-    { 129, 78 },    // EQUIP_PROJECTILE_SLOT
-    { 8,   123 },   // EQUIP_EVOL_RING1_SLOT
-    { 129, 123 },   // EQUIP_EVOL_RING2_SLOT
-};
-
 EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
                                  bool foring):
     Window(_("Equipment")),
@@ -98,6 +81,13 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
     setCloseButton(true);
     setSaveVisible(true);
     setDefaultSize(180, 345, ImageRect::CENTER);
+
+    mBoxes.reserve(13);
+    for (int f = 0; f < 13; f ++)
+        mBoxes.push_back(0);
+
+    fillBoxes();
+
     loadWindowState();
 
     mUnequip = new Button(_("Unequip"), "unequip", this);
@@ -109,11 +99,9 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
     add(mPlayerBox);
     add(mUnequip);
 
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
-    {
-        mEquipBox[i].posX = boxPosition[i][0] + getPadding();
-        mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
-    }
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    mBorderColor = Theme::getThemeColor(Theme::BORDER);
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 EquipmentWindow::~EquipmentWindow()
@@ -127,6 +115,8 @@ EquipmentWindow::~EquipmentWindow()
         delete mEquipment;
         mEquipment = 0;
     }
+    delete_all(mBoxes);
+    mBoxes.clear();
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
@@ -138,23 +128,31 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
 
     Window::drawChildren(graphics);
 
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
+    int i = 0;
+    const int fontHeight = getFont()->getHeight();
+
+    std::vector<std::pair<int, int>*>::const_iterator it;
+    std::vector<std::pair<int, int>*>::const_iterator it_end = mBoxes.end();
+
+    for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
     {
+        std::pair<int, int> *box = *it;
+        if (!box)
+            continue;
         if (i == mSelected)
         {
-            const gcn::Color color = Theme::getThemeColor(Theme::HIGHLIGHT);
-
+            mHighlightColor.a = getGuiAlpha();
             // Set color to the highlight color
-            g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
-            g->fillRectangle(gcn::Rectangle(mEquipBox[i].posX,
-                             mEquipBox[i].posY, BOX_WIDTH, BOX_HEIGHT));
+            g->setColor(mHighlightColor);
+            g->fillRectangle(gcn::Rectangle(box->first,
+                box->second, BOX_WIDTH, BOX_HEIGHT));
         }
 
         // Set color black
-        g->setColor(gcn::Color(0, 0, 0));
+        g->setColor(mBorderColor);
         // Draw box border
-        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
-                                        BOX_WIDTH, BOX_HEIGHT));
+        g->drawRectangle(gcn::Rectangle(box->first, box->second,
+            BOX_WIDTH, BOX_HEIGHT));
 
         if (!mEquipment)
             continue;
@@ -168,15 +166,13 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             {
                 image->setAlpha(1.0f); // Ensure the image is drawn
                                        // with maximum opacity
-                g->drawImage(image,
-                             mEquipBox[i].posX + 2,
-                             mEquipBox[i].posY + 2);
+                g->drawImage(image, box->first + 2, box->second + 2);
                 if (i == EQUIP_PROJECTILE_SLOT)
                 {
-                    g->setColor(Theme::getThemeColor(Theme::TEXT));
+                    g->setColor(getForegroundColor());
                     graphics->drawText(toString(item->getQuantity()),
-                        mEquipBox[i].posX + (BOX_WIDTH / 2),
-                        mEquipBox[i].posY - getFont()->getHeight(),
+                        box->first + (BOX_WIDTH / 2),
+                        box->second - fontHeight,
                         gcn::Graphics::CENTER);
                 }
             }
@@ -202,10 +198,17 @@ Item *EquipmentWindow::getItem(int x, int y) const
     if (!mEquipment)
         return 0;
 
-    for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
+    std::vector<std::pair<int, int>*>::const_iterator it;
+    std::vector<std::pair<int, int>*>::const_iterator it_end = mBoxes.end();
+    int i = 0;
+
+    for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
     {
-        gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
-                             BOX_WIDTH, BOX_HEIGHT);
+        std::pair<int, int> *box = *it;
+        if (!box)
+            continue;
+        const gcn::Rectangle tRect(box->first, box->second,
+            BOX_WIDTH, BOX_HEIGHT);
 
         if (tRect.isPointInRect(x, y))
             return mEquipment->getEquipment(i);
@@ -228,11 +231,19 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
         if (mForing)
             return;
         // Checks if any of the presses were in the equip boxes.
-        for (int i = 0; i < Equipment::EQUIP_VECTOREND; i++)
+        std::vector<std::pair<int, int>*>::const_iterator it;
+        std::vector<std::pair<int, int>*>::const_iterator
+            it_end = mBoxes.end();
+        int i = 0;
+
+        for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
         {
+            std::pair<int, int> *box = *it;
+            if (!box)
+                continue;
             Item *item = mEquipment->getEquipment(i);
-            gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
-                                 BOX_WIDTH, BOX_HEIGHT);
+            const gcn::Rectangle tRect(box->first, box->second,
+                BOX_WIDTH, BOX_HEIGHT);
 
             if (tRect.isPointInRect(x, y) && item)
                 setSelected(i);
@@ -326,3 +337,145 @@ void EquipmentWindow::resetBeing(Being *being)
     if (being == mBeing)
         setBeing(0);
 }
+
+void EquipmentWindow::fillBoxes()
+{
+    XML::Document *doc = new XML::Document("equipmentwindow.xml");
+    xmlNodePtr root = doc->rootNode();
+    if (!root)
+    {
+        delete doc;
+        fillDefault();
+        return;
+    }
+
+    for_each_xml_child_node(node, root)
+    {
+        if (xmlStrEqual(node->name, BAD_CAST "window"))
+            loadWindow(node);
+        else if (xmlStrEqual(node->name, BAD_CAST "playerbox"))
+            loadPlayerBox(node);
+        else if (xmlStrEqual(node->name, BAD_CAST "slot"))
+            loadSlot(node);
+    }
+    delete doc;
+}
+
+void EquipmentWindow::loadWindow(xmlNodePtr windowNode)
+{
+    setDefaultSize(XML::getProperty(windowNode, "width", 180),
+        XML::getProperty(windowNode, "height", 345), ImageRect::CENTER);
+}
+
+void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode)
+{
+    mPlayerBox->setDimension(gcn::Rectangle(
+        XML::getProperty(playerBoxNode, "x", 50),
+        XML::getProperty(playerBoxNode, "y", 80),
+        XML::getProperty(playerBoxNode, "width", 74),
+        XML::getProperty(playerBoxNode, "height", 168)));
+}
+
+void EquipmentWindow::loadSlot(xmlNodePtr slotNode)
+{
+    int slot = parseSlotName(XML::getProperty(slotNode, "name", ""));
+    if (slot < 0)
+        return;
+
+    const int x = XML::getProperty(slotNode, "x", 0) + getPadding();
+    const int y = XML::getProperty(slotNode, "y", 0) + getTitleBarHeight();
+
+    if (mBoxes[slot])
+    {
+        std::pair<int, int> *pair = mBoxes[slot];
+        pair->first = x;
+        pair->second = y;
+    }
+    else
+    {
+         mBoxes[slot] = new std::pair<int, int>(x, y);
+    }
+}
+
+int EquipmentWindow::parseSlotName(std::string name)
+{
+    int id = -1;
+    if (name == "shoes" || name == "boot" || name == "boots")
+    {
+        id = 4;
+    }
+    else if (name == "bottomclothes" || name == "bottom" || name == "pants")
+    {
+        id = 3;
+    }
+    else if (name == "topclothes" || name == "top"
+             || name == "torso" || name == "body")
+    {
+        id = 0;
+    }
+    else if (name == "free" || name == "misc1")
+    {
+        id = 5;
+    }
+    else if (name == "misc2" || name == "scarf" || name == "scarfs")
+    {
+        id = 7;
+    }
+    else if (name == "hat" || name == "hats")
+    {
+        id = 2;
+    }
+    else if (name == "wings")
+    {
+        id = 6;
+    }
+    else if (name == "glove" || name == "gloves")
+    {
+        id = 1;
+    }
+    else if (name == "weapon" || name == "weapons")
+    {
+        id = 8;
+    }
+    else if (name == "shield" || name == "shields")
+    {
+        id = 9;
+    }
+    else if (name == "amulet" || name == "amulets")
+    {
+        id = 11;
+    }
+    else if (name == "ring" || name == "rings")
+    {
+        id = 12;
+    }
+    else if (name == "arrow" || name == "arrows" || name == "ammo")
+    {
+        id = 10;
+    }
+
+    return id;
+}
+
+void EquipmentWindow::fillDefault()
+{
+    addBox(0, 90, 40);     // torso
+    addBox(1, 8, 78);      // gloves
+    addBox(2, 70, 0);      // hat
+    addBox(3, 50, 253);    // pants
+    addBox(4, 90, 253);    // boots
+    addBox(5, 8, 213);     // FREE
+    addBox(6, 129, 213);   // wings
+    addBox(7, 50, 40);     // scarf
+    addBox(8, 8, 168);     // weapon
+    addBox(9, 129, 168);   // shield
+    addBox(10, 129, 78);   // ammo
+    addBox(11, 8, 123);    // amulet
+    addBox(12, 129, 123);  // ring
+}
+
+void EquipmentWindow::addBox(int idx, int x, int y)
+{
+    mBoxes[idx] = new std::pair<int, int>(
+        x + getPadding(), y + getTitleBarHeight());
+}
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 84353dfd2..cadf27620 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -28,8 +28,12 @@
 
 #include "gui/widgets/window.h"
 
+#include "utils/xml.h"
+
 #include <guichan/actionlistener.hpp>
 
+#include <vector>
+
 #ifdef __GNUC__
 #define A_UNUSED  __attribute__ ((unused))
 #else
@@ -81,24 +85,28 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
     private:
         void mouseExited(gcn::MouseEvent &event);
+
         void mouseMoved(gcn::MouseEvent &event);
 
         Item *getItem(int x, int y) const;
 
         void setSelected(int index);
 
-        Equipment *mEquipment;
+        void fillBoxes();
 
-        /**
-         * Equipment box.
-         */
-        struct EquipBox
-        {
-            int posX;
-            int posY;
-        };
+        void fillDefault();
 
-        EquipBox mEquipBox[Equipment::EQUIP_VECTOREND]; /**<Equipment Boxes. */
+        void addBox(int idx, int x, int y);
+
+        void loadWindow(xmlNodePtr windowNode);
+
+        void loadPlayerBox(xmlNodePtr playerBoxNode);
+
+        void loadSlot(xmlNodePtr slotNode);
+
+        int parseSlotName(std::string name);
+
+        Equipment *mEquipment;
 
         ItemPopup *mItemPopup;
         PlayerBox *mPlayerBox;
@@ -107,6 +115,9 @@ class EquipmentWindow : public Window, public gcn::ActionListener
         int mSelected; /**< Index of selected item. */
         bool mForing;
         Being *mBeing;
+        std::vector<std::pair<int, int>*> mBoxes;
+        gcn::Color mHighlightColor;
+        gcn::Color mBorderColor;
 };
 
 extern EquipmentWindow *equipmentWindow;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0bea1d0d7..7d38b1025 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -35,7 +35,7 @@
 #include "configlistener.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 #include "resources/imageset.h"
@@ -107,9 +107,18 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     const int fontSize = config.getIntValue("fontSize");
+
     std::string fontFile = config.getValue("font", "");
-// may be here need get paths from paths.getValue?
-//    std::string path = resman->getPath(fontFile);
+
+    std::vector<std::string> langs = getLang();
+    if (!langs.empty() && langs[0].size() > 3
+        && langs[0].substr(0, 3) == "ja_")
+    {
+        fontFile = config.getValue("japanFont", "");
+        if (fontFile.empty())
+            fontFile = branding.getStringValue("japanFont");
+    }
+
     if (fontFile.empty())
         fontFile = branding.getStringValue("font");
 
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index ae0a432ea..368049389 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/helpwindow.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "gui/gui.h"
 #include "gui/setup.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 27fbf7760..3b7b7b273 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -427,7 +427,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
             else
             {
                 if (tradeWindow)
-                    tradeWindow->tradeItem(item, item->getQuantity());
+                    tradeWindow->tradeItem(item, item->getQuantity(), true);
             }
         }
     }
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index f5117ed5a..4d401a627 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -32,6 +32,7 @@
 #include "gui/theme.h"
 
 #include "gui/widgets/icon.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
 
 #include "utils/gettext.h"
@@ -54,7 +55,7 @@ ItemPopup::ItemPopup():
     mLastColor(1)
 {
     // Item Name
-    mItemName = new gcn::Label;
+    mItemName = new Label;
     mItemName->setFont(boldFont);
     mItemName->setPosition(getPadding(), getPadding());
 
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 95e16127a..05a265da7 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 3c7679ca9..ff2a8f010 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 5022f9210..c735eec82 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 
 #include "gui/userpalette.h"
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatuswindow.cpp
index 817cd74a5..08e3d0053 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 
 #include "animatedsprite.h"
 #include "configuration.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatuswindow.h
index f19055305..19517326b 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatuswindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MINISTATUS_H
-#define MINISTATUS_H
+#ifndef MINISTATUSWINDOW_H
+#define MINISTATUSWINDOW_H
 
 #include "inventory.h"
 #include "listener.h"
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 9dd41a643..d3bc6a302 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -28,10 +28,11 @@
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/chatwindow.h"
+#include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
@@ -77,6 +78,9 @@ OutfitWindow::OutfitWindow():
 
     addMouseListener(this);
 
+    mBorderColor = Theme::getThemeColor(Theme::BORDER, 64);
+    mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND, 32);
+
     mPreviousButton = new Button(_("<"), "previous", this);
     mNextButton = new Button(_(">"), "next", this);
     mCurrentLabel = new Label(strprintf(_("Outfit: %d"), 1));
@@ -303,9 +307,9 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
         const int itemX = 10 + ((i % mGridWidth) * mBoxWidth);
         const int itemY = 25 + ((i / mGridWidth) * mBoxHeight);
 
-        graphics->setColor(gcn::Color(0, 0, 0, 64));
+        graphics->setColor(mBorderColor);
         graphics->drawRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
-        graphics->setColor(gcn::Color(255, 255, 255, 32));
+        graphics->setColor(mBackgroundColor);
         graphics->fillRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
 
         if (mItems[mCurrentOutfit][i] < 0)
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 60634dbdd..8dd5fd6a3 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -137,6 +137,8 @@ class OutfitWindow : public Window, gcn::ActionListener
         int mAwayOutfit;
 
         Image *mBackgroundImg;
+        gcn::Color mBorderColor;
+        gcn::Color mBackgroundColor;
 
         static float mAlpha;
 };
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 9409bfc06..1cebe236f 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -24,7 +24,7 @@
 #ifndef PALETTE_H
 #define PALETTE_H
 
-#include "log.h"
+#include "logger.h"
 #include "utils/stringutils.h"
 
 #include <guichan/color.hpp>
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 79618ad04..61769bc7e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/popupmenu.h"
 
+#include "actorsprite.h"
 #include "actorspritemanager.h"
 #include "being.h"
 #include "dropshortcut.h"
@@ -31,7 +32,7 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "party.h"
 #include "playerinfo.h"
@@ -43,7 +44,7 @@
 #include "gui/equipmentwindow.h"
 #include "gui/inventorywindow.h"
 #include "gui/itemamountwindow.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 #include "gui/outfitwindow.h"
 #include "gui/selldialog.h"
 #include "gui/socialwindow.h"
@@ -94,7 +95,8 @@ PopupMenu::PopupMenu():
     mSpell(0),
     mDialog(0),
     mButton(0),
-    mNick("")
+    mNick(""),
+    mType(Being::UNKNOWN)
 {
     mBrowserBox = new BrowserBox;
     mBrowserBox->setPosition(4, 4);
@@ -105,6 +107,7 @@ PopupMenu::PopupMenu():
     mRenameListener.setDialog(0);
     mPlayerListener.setNick("");
     mPlayerListener.setDialog(0);
+    mPlayerListener.setType(Being::UNKNOWN);
 
     add(mBrowserBox);
 }
@@ -116,6 +119,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     mBeingId = being->getId();
     mNick = being->getName();
+    mType = being->getType();
     mBrowserBox->clearRows();
 
     const std::string &name = mNick;
@@ -278,6 +282,8 @@ void PopupMenu::showPopup(int x, int y, Being *being)
             mBrowserBox->addRow(strprintf("@@sell|%s@@", _("Sell")));
             mBrowserBox->addRow("##3---");
             mBrowserBox->addRow(strprintf("@@move|%s@@", _("Move")));
+            mBrowserBox->addRow(strprintf("@@addcomment|%s@@",
+                _("Add comment")));
             break;
 
         case ActorSprite::MONSTER:
@@ -359,6 +365,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick)
 
     mNick = nick;
     mBeingId = 0;
+    mType = Being::PLAYER;
     mBrowserBox->clearRows();
 
     const std::string &name = mNick;
@@ -495,6 +502,11 @@ void PopupMenu::showPopup(int x, int y, MapItem *mapItem)
     mBrowserBox->addRow(strprintf("@@rename map|%s@@", _("Rename")));
     mBrowserBox->addRow(strprintf("@@remove map|%s@@", _("Remove")));
 
+    if (player_node && player_node->isGM())
+    {
+        mBrowserBox->addRow("##3---");
+        mBrowserBox->addRow(strprintf("@@warp map|%s@@", _("Warp")));
+    }
     mBrowserBox->addRow("##3---");
     mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel")));
 
@@ -562,7 +574,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab)
     if (tab->getRemoveNames())
     {
         mBrowserBox->addRow(strprintf("@@dont remove name|%s@@",
-                            _("Dont remove name")));
+                            _("Don't remove name")));
     }
     else
     {
@@ -599,6 +611,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab)
         {
             mBeingId = being->getId();
             mNick = being->getName();
+            mType = being->getType();
 
             mBrowserBox->addRow(strprintf("@@trade|%s@@", _("Trade")));
             mBrowserBox->addRow(strprintf("@@attack|%s@@", _("Attack")));
@@ -728,6 +741,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab)
         else
         {
             mNick = name;
+            mType = Being::PLAYER;
             mBrowserBox->addRow(strprintf(
                 "@@addcomment|%s@@", _("Add comment")));
             mBrowserBox->addRow("##3---");
@@ -768,6 +782,7 @@ void PopupMenu::showChangePos(int x, int y)
         mItem = 0;
         mMapItem = 0;
         mNick = "";
+        mType = Being::UNKNOWN;
         setVisible(false);
     }
 }
@@ -1051,18 +1066,18 @@ void PopupMenu::handleLink(const std::string &link,
             int cnt = 10;
             if (cnt > mItem->getQuantity())
                 cnt = mItem->getQuantity();
-            tradeWindow->tradeItem(mItem, cnt);
+            tradeWindow->tradeItem(mItem, cnt, true);
         }
     }
     else if (link == "addtrade half" && mItem)
     {
         if (tradeWindow)
-            tradeWindow->tradeItem(mItem, mItem->getQuantity() / 2);
+            tradeWindow->tradeItem(mItem, mItem->getQuantity() / 2, true);
     }
     else if (link == "addtrade all" && mItem)
     {
         if (tradeWindow)
-            tradeWindow->tradeItem(mItem, mItem->getQuantity());
+            tradeWindow->tradeItem(mItem, mItem->getQuantity(), true);
     }
     else if (link == "retrieve" && mItem)
     {
@@ -1134,6 +1149,14 @@ void PopupMenu::handleLink(const std::string &link,
         if (chatWindow)
             chatWindow->clearTab();
     }
+    else if (link == "warp map" && mMapItem)
+    {
+        if (Game::instance())
+        {
+            Net::getAdminHandler()->warp(Game::instance()->getCurrentMapName(),
+                mMapItem->getX(), mMapItem->getY());
+        }
+    }
     else if (link == "remove map" && mMapItem)
     {
         if (viewport)
@@ -1220,6 +1243,7 @@ void PopupMenu::handleLink(const std::string &link,
             _("Comment:                      "));
         mPlayerListener.setDialog(dialog);
         mPlayerListener.setNick(mNick);
+        mPlayerListener.setType(mType);
 
         if (being)
         {
@@ -1228,7 +1252,7 @@ void PopupMenu::handleLink(const std::string &link,
         }
         else
         {
-            dialog->setText(Being::loadComment(mNick));
+            dialog->setText(Being::loadComment(mNick, mType));
         }
         dialog->setActionEventId("ok");
         dialog->addActionListener(&mPlayerListener);
@@ -1245,26 +1269,38 @@ void PopupMenu::handleLink(const std::string &link,
     else if (link == "enable highlight" && mTab)
     {
         mTab->setAllowHighlight(true);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "disable highlight" && mTab)
     {
         mTab->setAllowHighlight(false);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "dont remove name" && mTab)
     {
         mTab->setRemoveNames(false);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "remove name" && mTab)
     {
         mTab->setRemoveNames(true);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "disable away" && mTab)
     {
         mTab->setNoAway(true);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "enable away" && mTab)
     {
         mTab->setNoAway(false);
+        if (chatWindow)
+            chatWindow->saveState();
     }
     else if (link == "remove attack" && being)
     {
@@ -1548,6 +1584,7 @@ void PopupMenu::handleLink(const std::string &link,
     mItemColor = 1;
     mMapItem = 0;
     mNick = "";
+    mType = Being::UNKNOWN;
 }
 
 void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
@@ -1858,6 +1895,7 @@ void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name,
         return;
 
     mNick = name;
+    mType = Being::MONSTER;
 
     mBrowserBox->clearRows();
 
@@ -1989,7 +2027,8 @@ void RenameListener::action(const gcn::ActionEvent &event)
 
 PlayerListener::PlayerListener() :
     mNick(""),
-    mDialog(0)
+    mDialog(0),
+    mType(Being::UNKNOWN)
 {
 }
 
@@ -1999,10 +2038,10 @@ void PlayerListener::action(const gcn::ActionEvent &event)
     {
         std::string comment = mDialog->getText();
         Being* being  = actorSpriteManager->findBeingByName(
-            mNick, Being::PLAYER);
+            mNick, (ActorSprite::Type)mType);
         if (being)
             being->setComment(comment);
-        Being::saveComment(mNick, comment);
+        Being::saveComment(mNick, comment, mType);
     }
     mDialog = 0;
 }
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index afa4bdfa2..3a7f27d4b 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -78,9 +78,13 @@ class PlayerListener : public gcn::ActionListener
         void setDialog(TextDialog *dialog)
         { mDialog = dialog; }
 
+        void setType(int type)
+        { mType = type; }
+
     private:
         std::string mNick;
         TextDialog *mDialog;
+        int mType;
 };
 
 /**
@@ -171,6 +175,7 @@ class PopupMenu : public Popup, public LinkHandler
         TextDialog *mDialog;
         Button *mButton;
         std::string mNick;
+        int mType;
 
         /**
          * Shared code for the various showPopup functions.
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 28a3332bf..f66872b5d 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -53,7 +53,6 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
 
     mForceQuit = new RadioButton(_("Quit"), "quitdialog");
     mLogoutQuit = new RadioButton(_("Quit"), "quitdialog");
-    mSaveState = new CheckBox(_("Save state"), true);
     mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
     mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
     mOkButton = new Button(_("OK"), "ok", this);
@@ -91,9 +90,8 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
 
     place = getPlacer(0, 1);
 
-    place(0, 0, mSaveState, 3);
-    place(1, 1, mOkButton, 1);
-    place(2, 1, mCancelButton, 1);
+    place(1, 0, mOkButton, 1);
+    place(2, 0, mCancelButton, 1);
 
     reflowLayout(200, 0);
     setLocationRelativeTo(getParent());
@@ -133,8 +131,6 @@ void QuitDialog::action(const gcn::ActionEvent &event)
             if (map)
                 map->saveExtraLayer();
         }
-        if (chatWindow && mSaveState->isSelected())
-            chatWindow->saveState();
 
         if (mForceQuit->isSelected())
         {
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index d68910596..380a85528 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -65,7 +65,6 @@ class QuitDialog : public Window, public gcn::ActionListener,
         std::vector<gcn::RadioButton*> mOptions;
 
         gcn::RadioButton *mLogoutQuit;
-        gcn::CheckBox *mSaveState;
         gcn::RadioButton *mForceQuit;
         gcn::RadioButton *mSwitchAccountServer;
         gcn::RadioButton *mSwitchCharacter;
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 80ddb7469..913c958f2 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/logindialog.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index a0f8699f8..8dd7f929d 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -25,7 +25,7 @@
 
 #include "client.h"
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "resources/image.h"
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 140e4b629..763c190d6 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -22,10 +22,10 @@
 
 #include "gui/serverdialog.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "gui/gui.h"
@@ -124,6 +124,9 @@ std::string ServersListModel::getElementAt(int elementIndex)
 
 void ServersListModel::setVersionString(int index, const std::string &version)
 {
+    if (index >= (int)mVersionStrings.size())
+        return;
+
     if (version.empty())
     {
         mVersionStrings[index] = VersionString(0, "");
@@ -155,6 +158,10 @@ public:
     ServersListBox(ServersListModel *model):
             ListBox(model)
     {
+        mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+        mTextColor = Theme::getThemeColor(Theme::TEXT);
+        mNotSupportedColor = Theme::getThemeColor(
+            Theme::SERVER_VERSION_NOT_SUPPORTED);
     }
 
     void draw(gcn::Graphics *graphics)
@@ -166,20 +173,18 @@ public:
 
         updateAlpha();
 
-        graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
-                static_cast<int>(mAlpha * 255.0f)));
+        mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+        graphics->setColor(mHighlightColor);
         graphics->setFont(getFont());
 
         const int height = getRowHeight();
-        const gcn::Color unsupported =
-                Theme::getThemeColor(Theme::SERVER_VERSION_NOT_SUPPORTED,
-                                     static_cast<int>(mAlpha * 255.0f));
+        mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0f);
 
         // Draw filled rectangle around the selected list element
         if (mSelected >= 0)
         {
-            graphics->fillRectangle(gcn::Rectangle(0, height * mSelected,
-                                                   getWidth(), height));
+            graphics->fillRectangle(gcn::Rectangle(0,
+                height * mSelected, getWidth(), height));
         }
 
         // Draw the list elements
@@ -188,7 +193,7 @@ public:
         {
             ServerInfo info = model->getServer(i);
 
-            graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+            graphics->setColor(mTextColor);
 
             int top;
 
@@ -209,7 +214,7 @@ public:
 
             if (info.version.first > 0)
             {
-                graphics->setColor(unsupported);
+                graphics->setColor(mNotSupportedColor);
 
                 graphics->drawText(info.version.second,
                                    getWidth() - info.version.first - 2, top);
@@ -221,6 +226,10 @@ public:
     {
         return 2 * getFont()->getHeight();
     }
+private:
+    gcn::Color mHighlightColor;
+    gcn::Color mTextColor;
+    gcn::Color mNotSupportedColor;
 };
 
 
@@ -604,6 +613,13 @@ void ServerDialog::downloadServerList()
     if (listFile.empty())
         listFile = "http://manasource.org/serverlist.xml";
 
+    if (mDownload)
+    {
+        mDownload->cancel();
+        delete mDownload;
+        mDownload = 0;
+    }
+
     mDownload = new Net::Download(this, listFile, &downloadUpdate);
     mDownload->setFile(mDir + "/serverlist.xml");
     mDownload->start();
@@ -702,7 +718,6 @@ void ServerDialog::loadServers(bool addNew)
                 break;
             }
         }
-
         if (!found && addNew)
             mServers.push_back(server);
     }
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 33ff6ddb7..690871189 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -22,19 +22,22 @@
 
 #include "gui/setup.h"
 
+#include "chatwindow.h"
 #include "configuration.h"
 #include "game.h"
 #include "main.h"
 
 #include "gui/setup_audio.h"
+#include "gui/setup_chat.h"
 #include "gui/setup_colors.h"
 #include "gui/setup_joystick.h"
 #include "gui/setup_other.h"
 #include "gui/setup_theme.h"
 #include "gui/setup_keyboard.h"
+#include "gui/setup_perfomance.h"
 #include "gui/setup_players.h"
+#include "gui/setup_relations.h"
 #include "gui/setup_video.h"
-#include "gui/setup_chat.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -85,14 +88,17 @@ Setup::Setup():
 
     mPanel = new TabbedArea;
     mPanel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
+    mPanel->enableScrollButtons(true);
 
     mTabs.push_back(new Setup_Video);
     mTabs.push_back(new Setup_Audio);
+    mTabs.push_back(new Setup_Perfomance);
     mTabs.push_back(new Setup_Joystick);
     mTabs.push_back(new Setup_Keyboard);
     mTabs.push_back(new Setup_Colors);
     mTabs.push_back(new Setup_Chat);
     mTabs.push_back(new Setup_Players);
+    mTabs.push_back(new Setup_Relations);
     mTabs.push_back(new Setup_Theme);
     mTabs.push_back(new Setup_Other);
 
@@ -139,11 +145,12 @@ void Setup::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Cancel")
     {
-        setVisible(false);
-        for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
+        doCancel();
     }
     else if (event.getId() == "Store")
     {
+        if (chatWindow)
+            chatWindow->saveState();
         config.write();
         serverConfig.write();
     }
@@ -181,4 +188,10 @@ void Setup::registerWindowForReset(Window *window)
     mWindowsToReset.push_back(window);
 }
 
+void Setup::doCancel()
+{
+    setVisible(false);
+    for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
+}
+
 Setup *setupWindow;
diff --git a/src/gui/setup.h b/src/gui/setup.h
index ad5ba53d9..cdaf7db99 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -71,6 +71,8 @@ class Setup : public Window, public gcn::ActionListener
         void clearWindowsForReset()
         { mWindowsToReset.clear(); }
 
+        void doCancel();
+
     private:
         std::list<SetupTab*> mTabs;
         std::list<Window*> mWindowsToReset;
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 28e6d8cfa..1737e9004 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -23,7 +23,7 @@
 #include "gui/setup_audio.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "sound.h"
 
 #include "gui/okdialog.h"
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 7db61542a..9e75b9c0a 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -25,7 +25,6 @@
 
 #include "gui/chatwindow.h"
 #include "gui/editdialog.h"
-#include "gui/setupitem.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
@@ -34,10 +33,11 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/gettext.h"
 
@@ -93,6 +93,9 @@ Setup_Chat::Setup_Chat()
 
     new SetupItemLabel(_("Tabs"), "", this);
 
+    new SetupItemCheckBox(_("Put all whispers in tabs"), "",
+        "whispertab", this, "whispertabEvent");
+
     new SetupItemCheckBox(_("Log magic messages in debug tab"), "",
         "showMagicInDebug", this, "showMagicInDebugEvent");
 
@@ -117,6 +120,11 @@ Setup_Chat::Setup_Chat()
     new SetupItemCheckBox(_("Use local time"), "",
         "useLocalTime", this, "useLocalTimeEvent");
 
+    new SetupItemLabel(_("Other"), "", this);
+
+    new SetupItemTextField(_("Highlight words (separated by comma)"), "",
+        "highlightWords", this, "highlightWordsEvent");
+
     setDimension(gcn::Rectangle(0, 0, 550, 350));
 }
 
@@ -125,5 +133,8 @@ void Setup_Chat::apply()
     SetupTabScroll::apply();
 
     if (chatWindow)
+    {
         chatWindow->adjustTabSize();
+        chatWindow->parseHighlights();
+    }
 }
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index 0b69984c8..402235d99 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index ac047e34b..b405f5045 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -23,13 +23,12 @@
 
 #include "gui/setup_other.h"
 
-#include "gui/setupitem.h"
-
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 945a2de46..a13bf4ba3 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -1,10 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
new file mode 100644
index 000000000..dfb119b91
--- /dev/null
+++ b/src/gui/setup_perfomance.cpp
@@ -0,0 +1,98 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "gui/setup_perfomance.h"
+
+#include "gui/chatwindow.h"
+#include "gui/editdialog.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/chattab.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/inttextfield.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
+
+#include "configuration.h"
+#include "localplayer.h"
+#include "logger.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+Setup_Perfomance::Setup_Perfomance()
+{
+    setName(_("Perfomance"));
+
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+    place(0, 0, mScroll, 10, 10);
+
+    new SetupItemLabel(_("Better perfomance (enable for better perfomance)"),
+        "", this);
+
+    new SetupItemCheckBox(_("Auto adjust perfomance"), "",
+        "adjustPerfomance", this, "adjustPerfomanceEvent");
+
+    new SetupItemCheckBox(_("Show beings transparency"), "",
+        "beingopacity", this, "beingopacityEvent");
+
+    new SetupItemCheckBox(_("Hw acceleration"), "",
+        "hwaccel", this, "hwaccelEvent");
+
+    new SetupItemCheckBox(_("Enable opacity cache (Software, can "
+        "use many memory)"), "", "alphaCache", this, "alphaCacheEvent");
+
+    new SetupItemCheckBox(_("Enable map reduce (Software)"), "",
+        "enableMapReduce", this, "enableMapReduceEvent");
+
+    new SetupItemLabel(_("Better quality (disable for better perfomance)"),
+        "", this);
+
+    new SetupItemCheckBox(_("Enable alpha channel fix (Software, can "
+        "be very slow)"), "Can slow down drawing", "enableAlphaFix",
+        this, "enableAlphaFixEvent");
+
+    new SetupItemCheckBox(_("Enable reorder sprites."), "",
+        "enableReorderSprites", this, "enableReorderSpritesEvent");
+
+    new SetupItemLabel(_("Small memory (enable for lower memory usage)"),
+         "", this);
+
+    new SetupItemCheckBox(_("Disable advanced beings caching (Software)"), "",
+        "disableAdvBeingCaching", this, "disableAdvBeingCachingEvent");
+
+    new SetupItemCheckBox(_("Disable beings caching (Software)"), "",
+        "disableBeingCaching", this, "disableBeingCachingEvent");
+
+    setDimension(gcn::Rectangle(0, 0, 550, 350));
+}
+
+void Setup_Perfomance::apply()
+{
+    SetupTabScroll::apply();
+}
diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h
new file mode 100644
index 000000000..f355c9691
--- /dev/null
+++ b/src/gui/setup_perfomance.h
@@ -0,0 +1,44 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef GUI_SETUP_PERFOMANCE_H
+#define GUI_SETUP_PERFOMANCE_H
+
+#include "guichanfwd.h"
+
+#include "gui/widgets/setuptabscroll.h"
+
+#include <guichan/actionlistener.hpp>
+
+class IntTextField;
+class EditDialog;
+
+class Setup_Perfomance : public SetupTabScroll
+{
+    public:
+        Setup_Perfomance();
+
+        void apply();
+};
+
+#endif
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 67ec053ea..78c77f6f1 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2008-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
@@ -17,565 +17,71 @@
  *  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/>.
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gui/setup_players.h"
 
-#include "actorspritemanager.h"
-#include "configuration.h"
-#include "localplayer.h"
-#include "log.h"
-
+#include "gui/chatwindow.h"
 #include "gui/editdialog.h"
-#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/chattab.h"
 #include "gui/widgets/checkbox.h"
-#include "gui/widgets/dropdown.h"
+#include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/table.h"
-#include "gui/widgets/textfield.h"
-
-#include "utils/dtor.h"
-#include "utils/gettext.h"
-
-#include <string>
-#include <vector>
+#include "gui/widgets/setupitem.h"
 
-#define COLUMNS_NR 2 // name plus listbox
-#define NAME_COLUMN 0
-#define RELATION_CHOICE_COLUMN 1
-
-#define ROW_HEIGHT 12
-// The following column widths really shouldn't be hardcoded but should scale with the size of the widget... except
-// that, right now, the widget doesn't exactly scale either.
-#define NAME_COLUMN_WIDTH 230
-#define RELATION_CHOICE_COLUMN_WIDTH 80
+#include "configuration.h"
+#include "localplayer.h"
+#include "logger.h"
 
-#define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
+#include "utils/gettext.h"
 
 #include "debug.h"
 
-static const char *table_titles[COLUMNS_NR] =
-{
-    N_("Name"),
-    N_("Relation")
-};
-
-static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
-{
-    N_("Neutral"),
-    N_("Friend"),
-    N_("Disregarded"),
-    N_("Ignored"),
-    N_("Erased")
-};
-
-class PlayerRelationListModel : public gcn::ListModel
-{
-public:
-    virtual ~PlayerRelationListModel() { }
-
-    virtual int getNumberOfElements()
-    {
-        return PlayerRelation::RELATIONS_NR;
-    }
-
-    virtual std::string getElementAt(int i)
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "";
-        return gettext(RELATION_NAMES[i]);
-    }
-};
-
-class PlayerTableModel : public TableModel
-{
-public:
-    PlayerTableModel() :
-        mPlayers(NULL),
-        mListModel(new PlayerRelationListModel)
-    {
-        playerRelationsUpdated();
-    }
-
-    virtual ~PlayerTableModel()
-    {
-        freeWidgets();
-        delete mListModel;
-        mListModel = 0;
-        delete mPlayers;
-        mPlayers = 0;
-    }
-
-    virtual int getRows() const
-    {
-        if (mPlayers)
-            return static_cast<int>(mPlayers->size());
-        else
-            return 0;
-    }
-
-    virtual int getColumns() const
-    {
-        return COLUMNS_NR;
-    }
-
-    virtual int getRowHeight() const
-    {
-        return ROW_HEIGHT;
-    }
-
-    virtual int getColumnWidth(int index) const
-    {
-        if (index == NAME_COLUMN)
-            return NAME_COLUMN_WIDTH;
-        else
-            return RELATION_CHOICE_COLUMN_WIDTH;
-    }
-
-    virtual void playerRelationsUpdated()
-    {
-        signalBeforeUpdate();
-
-        freeWidgets();
-        std::vector<std::string> *player_names = player_relations.getPlayers();
-
-        if (!player_names)
-            return;
-
-        delete mPlayers;
-        mPlayers = player_names;
-
-        // set up widgets
-        for (unsigned int r = 0; r < player_names->size(); ++r)
-        {
-            std::string name = (*player_names)[r];
-            gcn::Widget *widget = new Label(name);
-            mWidgets.push_back(widget);
-
-            gcn::DropDown *choicebox = new DropDown(mListModel);
-            choicebox->setSelected(player_relations.getRelation(name));
-            mWidgets.push_back(choicebox);
-        }
-
-        signalAfterUpdate();
-    }
-
-    virtual void updateModelInRow(int row)
-    {
-        gcn::DropDown *choicebox = static_cast<gcn::DropDown *>(
-                                   getElementAt(row, RELATION_CHOICE_COLUMN));
-        player_relations.setRelation(getPlayerAt(row),
-                                   static_cast<PlayerRelation::Relation>(
-                                   choicebox->getSelected()));
-    }
-
-
-    virtual gcn::Widget *getElementAt(int row, int column) const
-    {
-        return mWidgets[WIDGET_AT(row, column)];
-    }
-
-    virtual void freeWidgets()
-    {
-        delete mPlayers;
-        mPlayers = 0;
-
-        delete_all(mWidgets);
-        mWidgets.clear();
-    }
-
-    std::string getPlayerAt(int index) const
-    {
-        return (*mPlayers)[index];
-    }
-
-protected:
-    std::vector<std::string> *mPlayers;
-    std::vector<gcn::Widget *> mWidgets;
-    PlayerRelationListModel *mListModel;
-};
-
-/**
- * Class for choosing one of the various `what to do when ignoring a player' options
- */
-class IgnoreChoicesListModel : public gcn::ListModel
-{
-public:
-    virtual ~IgnoreChoicesListModel() { }
-
-    virtual int getNumberOfElements()
-    {
-        return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
-                                ->size());
-    }
-
-    virtual std::string getElementAt(int i)
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return _("???");
-
-        return (*player_relations.getPlayerIgnoreStrategies())
-            [i]->mDescription;
-    }
-};
-
-#define ACTION_DELETE "delete"
-#define ACTION_OLD "old"
-#define ACTION_TABLE "table"
-#define ACTION_STRATEGY "strategy"
-#define ACTION_WHISPER_TAB "whisper tab"
-#define ACTION_SHOW_GENDER "show gender"
-#define ACTION_SHOW_LEVEL "show level"
-#define ACTION_TARGET_DEAD "target dead"
-#define ACTION_SHOW_OWN_NAME "show own name"
-#define ACTION_SECURE_TRADES "secure trades"
-#define ACTION_UNSECURE "unsecure"
-#define ACTION_EDIT_UNSECURE "edit unsecure"
-#define ACTION_EDIT_UNSECURE_OK "edit unsecure ok"
-
-Setup_Players::Setup_Players():
-    mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
-    mPlayerTableModel(new PlayerTableModel),
-    mPlayerTable(new GuiTable(mPlayerTableModel)),
-    mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
-    mPlayerScrollArea(new ScrollArea(mPlayerTable)),
-    mDefaultTrading(new CheckBox(_("Allow trading"),
-                player_relations.getDefault() & PlayerRelation::TRADE)),
-    mDefaultWhisper(new CheckBox(_("Allow whispers"),
-                player_relations.getDefault() & PlayerRelation::WHISPER)),
-    mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
-    mOldButton(new Button(_("Old"), ACTION_OLD, this)),
-    mWhisperTab(config.getBoolValue("whispertab")),
-    mWhisperTabCheckBox(new CheckBox(_("Put all whispers in tabs"),
-                        mWhisperTab)),
-    mShowGender(config.getBoolValue("showgender")),
-    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender)),
-    mShowLevel(config.getBoolValue("showlevel")),
-    mShowOwnName(config.getBoolValue("showownname")),
-    mTargetDead(config.getBoolValue("targetDeadPlayers")),
-    mSecureTrades(config.getBoolValue("securetrades")),
-    mUnsecureChars(config.getStringValue("unsecureChars")),
-    mVisibleNamesEnabled(config.getBoolValue("visiblenames")),
-    mShowPlayersStatus(config.getBoolValue("showPlayersStatus")),
-    mEditDialog(0)
+Setup_Players::Setup_Players()
 {
     setName(_("Players"));
 
-    mPlayerTable->setOpaque(false);
-
-    mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH);
-    mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN,
-                                           RELATION_CHOICE_COLUMN_WIDTH);
-    mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
-
-    mIgnoreActionChoicesModel = new IgnoreChoicesListModel;
-    mIgnoreActionChoicesBox = new DropDown(mIgnoreActionChoicesModel);
-
-    for (int i = 0; i < COLUMNS_NR; i++)
-    {
-        mPlayerTableTitleModel->set(0, i,
-                new Label(gettext(table_titles[i])));
-    }
-
-    mPlayerTitleTable->setLinewiseSelection(true);
-
-    mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mPlayerTable->setActionEventId(ACTION_TABLE);
-    mPlayerTable->setLinewiseSelection(true);
-    mPlayerTable->addActionListener(this);
-
-    gcn::Label *ignore_action_label = new Label(_("When ignoring:"));
-
-    mIgnoreActionChoicesBox->setActionEventId(ACTION_STRATEGY);
-    mIgnoreActionChoicesBox->addActionListener(this);
-
-    int ignore_strategy_index = 0; // safe default
-
-    if (player_relations.getPlayerIgnoreStrategy())
-    {
-        ignore_strategy_index = player_relations.getPlayerIgnoreStrategyIndex(
-            player_relations.getPlayerIgnoreStrategy()->mShortName);
-        if (ignore_strategy_index < 0)
-            ignore_strategy_index = 0;
-    }
-    mIgnoreActionChoicesBox->setSelected(ignore_strategy_index);
-    mIgnoreActionChoicesBox->adjustHeight();
-
-    mWhisperTabCheckBox->setActionEventId(ACTION_WHISPER_TAB);
-    mWhisperTabCheckBox->addActionListener(this);
-
-    mShowGenderCheckBox->setActionEventId(ACTION_SHOW_GENDER);
-    mShowGenderCheckBox->addActionListener(this);
-
-    mShowLevelCheckBox = new CheckBox(_("Show level"), mShowLevel);
-    mShowLevelCheckBox->setActionEventId(ACTION_SHOW_LEVEL);
-    mShowLevelCheckBox->addActionListener(this);
-
-    mShowOwnNameCheckBox = new CheckBox(_("Show own name"), mShowOwnName);
-    mShowOwnNameCheckBox->setActionEventId(ACTION_SHOW_OWN_NAME);
-    mShowOwnNameCheckBox->addActionListener(this);
-
-    mTargetDeadCheckBox = new CheckBox(_("Target dead players"), mTargetDead);
-    mTargetDeadCheckBox->setActionEventId(ACTION_TARGET_DEAD);
-    mTargetDeadCheckBox->addActionListener(this);
-
-    mSecureTradesCheckBox = new CheckBox(_("Secure trades"), mSecureTrades);
-    mSecureTradesCheckBox->setActionEventId(ACTION_SECURE_TRADES);
-    mSecureTradesCheckBox->addActionListener(this);
-
-    mUnsecureCharsLabel = new Label(_("Unsecure chars in names"));
-    mUnsecureCharsField = new TextField(mUnsecureChars,
-        true, this, ACTION_UNSECURE);
-    mUnsecureCharsButton = new Button(_("Edit"), ACTION_EDIT_UNSECURE, this);
-
-    mVisibleNamesCheckBox = new CheckBox(_("Visible names"),
-        mVisibleNamesEnabled);
-    mVisibleNamesCheckBox->setActionEventId("visiblenames");
-    mVisibleNamesCheckBox->addActionListener(this);
-
-    mShowPlayersStatusCheckBox = new CheckBox(_("Show statuses"),
-        mShowPlayersStatus);
-    mShowPlayersStatusCheckBox->setActionEventId("showPlayersStatus");
-    mShowPlayersStatusCheckBox->addActionListener(this);
-
-    reset();
-
-    // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
+    place(0, 0, mScroll, 10, 10);
 
-    place(0, 0, mPlayerTitleTable, 6);
-    place(0, 1, mPlayerScrollArea, 6, 4).setPadding(2);
-    place(0, 5, mDeleteButton);
-    place(0, 6, mShowGenderCheckBox, 3).setPadding(2);
-    place(0, 7, mShowLevelCheckBox, 3).setPadding(2);
-    place(0, 8, mShowOwnNameCheckBox, 3).setPadding(2);
-    place(1, 5, mOldButton, 1);
-    place(3, 5, ignore_action_label, 1);
-    place(4, 5, mIgnoreActionChoicesBox, 2).setPadding(2);
-    place(3, 6, mDefaultTrading, 3);
-    place(3, 7, mDefaultWhisper, 3);
-    place(3, 8, mSecureTradesCheckBox, 3);
-    place(3, 9, mUnsecureCharsLabel, 3);
-    place(3, 10, mUnsecureCharsField, 2);
-    place(3, 11, mShowPlayersStatusCheckBox, 2);
-    place(5, 10, mUnsecureCharsButton, 1);
-    place(0, 9, mWhisperTabCheckBox, 3).setPadding(4);
-    place(0, 10, mTargetDeadCheckBox, 3).setPadding(4);
-    place(0, 11, mVisibleNamesCheckBox, 3).setPadding(4);
+    new SetupItemCheckBox(_("Show gender"), "",
+        "showgender", this, "showgenderEvent");
 
-    player_relations.addListener(this);
+    new SetupItemCheckBox(_("Show level"), "",
+        "showlevel", this, "showlevelEvent");
 
-    setDimension(gcn::Rectangle(0, 0, 500, 350));
-}
+    new SetupItemCheckBox(_("Show own name"), "",
+        "showownname", this, "showownnameEvent");
 
-Setup_Players::~Setup_Players()
-{
-    player_relations.removeListener(this);
-    delete mIgnoreActionChoicesModel;
-    mIgnoreActionChoicesModel = 0;
-}
+    new SetupItemCheckBox(_("Target dead players"), "",
+        "targetDeadPlayers", this, "targetDeadPlayersEvent");
 
+    new SetupItemCheckBox(_("Visible names"), "",
+        "visiblenames", this, "visiblenamesEvent");
 
-void Setup_Players::reset()
-{
-    // We now have to search through the list of ignore choices to find the
-    // current selection. We could use an index into the table of config
-    // options in player_relations instead of strategies to sidestep this.
-    int selection = 0;
-    for (unsigned int i = 0;
-                      i < player_relations.getPlayerIgnoreStrategies()->size();
-                      ++i)
-        if ((*player_relations.getPlayerIgnoreStrategies())[i] ==
-            player_relations.getPlayerIgnoreStrategy())
-        {
+    new SetupItemCheckBox(_("Secure trades"), "",
+        "securetrades", this, "securetradesEvent");
 
-            selection = i;
-            break;
-        }
+    new SetupItemTextField(_("Unsecure chars in names"), "",
+        "unsecureChars", this, "unsecureCharsEvent");
 
-    mIgnoreActionChoicesBox->setSelected(selection);
-}
+    new SetupItemCheckBox(_("Show statuses"), "",
+        "showPlayersStatus", this, "showPlayersStatusEvent");
 
-void Setup_Players::apply()
-{
-    player_relations.store();
-
-    unsigned int old_default_relations = player_relations.getDefault() &
-                                         ~(PlayerRelation::TRADE |
-                                           PlayerRelation::WHISPER);
-    player_relations.setDefault(old_default_relations
-                                | (mDefaultTrading->isSelected() ?
-                                       PlayerRelation::TRADE : 0)
-                                | (mDefaultWhisper->isSelected() ?
-                                       PlayerRelation::WHISPER : 0));
-    config.setValue("whispertab", mWhisperTab);
-    config.setValue("showlevel", mShowLevel);
-    config.setValue("showownname", mShowOwnName);
-    config.setValue("targetDeadPlayers", mTargetDead);
-    config.setValue("showgender", mShowGender);
-    config.setValue("securetrades", mSecureTrades);
-    config.setValue("unsecureChars", mUnsecureCharsField->getText());
-    config.setValue("visiblenames", mVisibleNamesEnabled);
-    config.setValue("showPlayersStatus", mShowPlayersStatus);
-
-    if (actorSpriteManager)
-        actorSpriteManager->updatePlayerNames();
-
-    if (player_node)
-        player_node->setCheckNameSetting(true);
-}
+    new SetupItemCheckBox(_("Show ip addresses on screenshots"), "",
+        "showip", this, "showipEvent");
 
-void Setup_Players::cancel()
-{
-    mWhisperTab = config.getBoolValue("whispertab");
-    mWhisperTabCheckBox->setSelected(mWhisperTab);
-    mShowGender = config.getBoolValue("showgender");
-    mShowGenderCheckBox->setSelected(mShowGender);
-    mShowLevel = config.getBoolValue("showlevel");
-    mShowLevelCheckBox->setSelected(mShowLevel);
-    mShowOwnName = config.getBoolValue("showownname");
-    mShowOwnNameCheckBox->setSelected(mShowOwnName);
-    mTargetDead = config.getBoolValue("targetDeadPlayers");
-    mTargetDeadCheckBox->setSelected(mTargetDead);
-    mSecureTrades = config.getBoolValue("securetrades");
-    mSecureTradesCheckBox->setSelected(mSecureTrades);
-    mUnsecureChars = config.getStringValue("unsecureChars");
-    mUnsecureCharsField->setText(mUnsecureChars);
-    mVisibleNamesEnabled = config.getBoolValue("visiblenames");
-    mVisibleNamesCheckBox->setSelected(mVisibleNamesEnabled);
-    mShowPlayersStatus = config.getBoolValue("showPlayersStatus");
-    mShowPlayersStatusCheckBox->setSelected(mShowPlayersStatus);
+    setDimension(gcn::Rectangle(0, 0, 550, 350));
 }
 
-void Setup_Players::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == ACTION_TABLE)
-    {
-        // temporarily eliminate ourselves: we are fully aware of this change,
-        // so there is no need for asynchronous updates.  (In fact, thouse
-        // might destroy the widet that triggered them, which would be rather
-        // embarrassing.)
-        player_relations.removeListener(this);
-
-        int row = mPlayerTable->getSelectedRow();
-        if (row >= 0)
-            mPlayerTableModel->updateModelInRow(row);
-
-        player_relations.addListener(this);
-
-    }
-    else if (event.getId() == ACTION_DELETE)
-    {
-        int player_index = mPlayerTable->getSelectedRow();
-
-        if (player_index < 0)
-            return;
-
-        std::string name = mPlayerTableModel->getPlayerAt(player_index);
-
-        player_relations.removePlayer(name);
-    }
-    else if (event.getId() == ACTION_OLD)
-    {
-        player_relations.load(true);
-        updateAll();
-    }
-    else if (event.getId() == ACTION_STRATEGY)
-    {
-        PlayerIgnoreStrategy *s =
-            (*player_relations.getPlayerIgnoreStrategies())[
-                mIgnoreActionChoicesBox->getSelected()];
-
-        player_relations.setPlayerIgnoreStrategy(s);
-    }
-    else if (event.getId() == ACTION_WHISPER_TAB)
-    {
-        mWhisperTab = mWhisperTabCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_SHOW_GENDER)
-    {
-        mShowGender = mShowGenderCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_SHOW_LEVEL)
-    {
-        mShowLevel = mShowLevelCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_SHOW_OWN_NAME)
-    {
-        mShowOwnName = mShowOwnNameCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_TARGET_DEAD)
-    {
-        mTargetDead = mTargetDeadCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_SECURE_TRADES)
-    {
-        mSecureTrades = mSecureTradesCheckBox->isSelected();
-    }
-    else if (event.getId() == ACTION_EDIT_UNSECURE)
-    {
-        mEditDialog = new EditDialog(_("Unsecure chars in names"),
-            mUnsecureCharsField->getText(), ACTION_EDIT_UNSECURE_OK);
-        mEditDialog->addActionListener(this);
-    }
-    else if (event.getId() == ACTION_EDIT_UNSECURE_OK)
-    {
-        mUnsecureCharsField->setText(mEditDialog->getMsg());
-    }
-    else if (event.getId() == ACTION_UNSECURE)
-    {
-        mUnsecureChars = mUnsecureCharsField->getText();
-    }
-    else if (event.getId() == "visiblenames")
-    {
-        mVisibleNamesEnabled = mVisibleNamesCheckBox->isSelected();
-    }
-    else if (event.getId() == "showPlayersStatus")
-    {
-        mShowPlayersStatus = mShowPlayersStatusCheckBox->isSelected();
-    }
-}
-
-void Setup_Players::updatedPlayer(const std::string &name A_UNUSED)
-{
-    mPlayerTableModel->playerRelationsUpdated();
-    mDefaultTrading->setSelected(
-            player_relations.getDefault() & PlayerRelation::TRADE);
-    mDefaultWhisper->setSelected(
-            player_relations.getDefault() & PlayerRelation::WHISPER);
-    if (player_node)
-        player_node->updateName();
-}
-
-void Setup_Players::updateAll()
+void Setup_Players::apply()
 {
-    PlayerTableModel *model = new PlayerTableModel();
-    mPlayerTable->setModel(model);
-    delete mPlayerTableModel;
-    mPlayerTableModel = model;
-    int ignore_strategy_index = 0; // safe default
-
-    if (player_relations.getPlayerIgnoreStrategy())
-    {
-        ignore_strategy_index = player_relations.getPlayerIgnoreStrategyIndex(
-                player_relations.getPlayerIgnoreStrategy()->mShortName);
-        if (ignore_strategy_index < 0)
-            ignore_strategy_index = 0;
-    }
-    mIgnoreActionChoicesBox->setSelected(ignore_strategy_index);
-    mIgnoreActionChoicesBox->adjustHeight();
-    reset();
+    SetupTabScroll::apply();
 }
-void Setup_Players::externalUpdated()
-{
-    mDefaultTrading->setSelected(
-        player_relations.getDefault() & PlayerRelation::TRADE);
-    mDefaultWhisper->setSelected(
-        player_relations.getDefault() & PlayerRelation::WHISPER);
-}
-\ No newline at end of file
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 9f35d1600..c9ce7b3b3 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2008-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  Andrei Karas
  *  Copyright (C) 2011  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
@@ -17,96 +17,28 @@
  *  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/>.
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef GUI_SETUP_PLAYERS_H
 #define GUI_SETUP_PLAYERS_H
 
 #include "guichanfwd.h"
-#include "playerrelations.h"
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/setuptabscroll.h"
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
+class IntTextField;
 class EditDialog;
-class GuiTable;
-class PlayerTableModel;
-class StaticTableModel;
 
-class Setup_Players : public SetupTab,
-                      public PlayerRelationsListener
+class Setup_Players : public SetupTabScroll
 {
-public:
-    Setup_Players();
-    virtual ~Setup_Players();
-
-    void apply();
-    void cancel();
-
-    void reset();
-
-    void action(const gcn::ActionEvent &event);
-
-    virtual void updatedPlayer(const std::string &name);
-
-    virtual void updateAll();
-
-    virtual void externalUpdated();
-
-private:
-    StaticTableModel *mPlayerTableTitleModel;
-    PlayerTableModel *mPlayerTableModel;
-    GuiTable *mPlayerTable;
-    GuiTable *mPlayerTitleTable;
-    gcn::ScrollArea *mPlayerScrollArea;
-
-    gcn::CheckBox *mDefaultTrading;
-    gcn::CheckBox *mDefaultWhisper;
-
-    gcn::Button *mDeleteButton;
-    gcn::Button *mOldButton;
-
-    gcn::ListModel *mIgnoreActionChoicesModel;
-    gcn::DropDown *mIgnoreActionChoicesBox;
-
-    bool mWhisperTab;
-    gcn::CheckBox *mWhisperTabCheckBox;
-
-    bool mShowGender;
-    gcn::CheckBox *mShowGenderCheckBox;
-
-    bool mShowLevel;
-    gcn::CheckBox *mShowLevelCheckBox;
-
-    bool mShowOwnName;
-    gcn::CheckBox *mShowOwnNameCheckBox;
-
-    bool mTargetDead;
-    gcn::CheckBox *mTargetDeadCheckBox;
-
-    bool mSecureTrades;
-    gcn::CheckBox *mSecureTradesCheckBox;
-
-    gcn::Label *mUnsecureCharsLabel;
-    gcn::TextField *mUnsecureCharsField;
-    gcn::Button *mUnsecureCharsButton;
-    std::string mUnsecureChars;
-
-    bool mVisibleNamesEnabled;
-    gcn::CheckBox *mVisibleNamesCheckBox;
-
-    bool mShowPlayersStatus;
-    gcn::CheckBox *mShowPlayersStatusCheckBox;
+    public:
+        Setup_Players();
 
-    EditDialog *mEditDialog;
+        void apply();
 };
 
 #endif
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
new file mode 100644
index 000000000..489d5a818
--- /dev/null
+++ b/src/gui/setup_relations.cpp
@@ -0,0 +1,439 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/setup_relations.h"
+
+#include "actorspritemanager.h"
+#include "configuration.h"
+#include "localplayer.h"
+#include "logger.h"
+
+#include "gui/editdialog.h"
+#include "gui/okdialog.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/scrollarea.h"
+#include "gui/widgets/guitable.h"
+#include "gui/widgets/textfield.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+
+#include <string>
+#include <vector>
+
+#define COLUMNS_NR 2 // name plus listbox
+#define NAME_COLUMN 0
+#define RELATION_CHOICE_COLUMN 1
+
+#define ROW_HEIGHT 12
+// The following column widths really shouldn't be hardcoded but should scale with the size of the widget... except
+// that, right now, the widget doesn't exactly scale either.
+#define NAME_COLUMN_WIDTH 230
+#define RELATION_CHOICE_COLUMN_WIDTH 80
+
+#define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
+
+#include "debug.h"
+
+static const char *table_titles[COLUMNS_NR] =
+{
+    N_("Name"),
+    N_("Relation")
+};
+
+static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
+{
+    N_("Neutral"),
+    N_("Friend"),
+    N_("Disregarded"),
+    N_("Ignored"),
+    N_("Erased")
+};
+
+class PlayerRelationListModel : public gcn::ListModel
+{
+public:
+    virtual ~PlayerRelationListModel() { }
+
+    virtual int getNumberOfElements()
+    {
+        return PlayerRelation::RELATIONS_NR;
+    }
+
+    virtual std::string getElementAt(int i)
+    {
+        if (i >= getNumberOfElements() || i < 0)
+            return "";
+        return gettext(RELATION_NAMES[i]);
+    }
+};
+
+class PlayerTableModel : public TableModel
+{
+public:
+    PlayerTableModel() :
+        mPlayers(NULL),
+        mListModel(new PlayerRelationListModel)
+    {
+        playerRelationsUpdated();
+    }
+
+    virtual ~PlayerTableModel()
+    {
+        freeWidgets();
+        delete mListModel;
+        mListModel = 0;
+        delete mPlayers;
+        mPlayers = 0;
+    }
+
+    virtual int getRows() const
+    {
+        if (mPlayers)
+            return static_cast<int>(mPlayers->size());
+        else
+            return 0;
+    }
+
+    virtual int getColumns() const
+    {
+        return COLUMNS_NR;
+    }
+
+    virtual int getRowHeight() const
+    {
+        return ROW_HEIGHT;
+    }
+
+    virtual int getColumnWidth(int index) const
+    {
+        if (index == NAME_COLUMN)
+            return NAME_COLUMN_WIDTH;
+        else
+            return RELATION_CHOICE_COLUMN_WIDTH;
+    }
+
+    virtual void playerRelationsUpdated()
+    {
+        signalBeforeUpdate();
+
+        freeWidgets();
+        std::vector<std::string> *player_names = player_relations.getPlayers();
+
+        if (!player_names)
+            return;
+
+        delete mPlayers;
+        mPlayers = player_names;
+
+        // set up widgets
+        for (unsigned int r = 0; r < player_names->size(); ++r)
+        {
+            std::string name = (*player_names)[r];
+            gcn::Widget *widget = new Label(name);
+            mWidgets.push_back(widget);
+
+            gcn::DropDown *choicebox = new DropDown(mListModel);
+            choicebox->setSelected(player_relations.getRelation(name));
+            mWidgets.push_back(choicebox);
+        }
+
+        signalAfterUpdate();
+    }
+
+    virtual void updateModelInRow(int row)
+    {
+        gcn::DropDown *choicebox = static_cast<gcn::DropDown *>(
+                                   getElementAt(row, RELATION_CHOICE_COLUMN));
+        player_relations.setRelation(getPlayerAt(row),
+                                   static_cast<PlayerRelation::Relation>(
+                                   choicebox->getSelected()));
+    }
+
+
+    virtual gcn::Widget *getElementAt(int row, int column) const
+    {
+        return mWidgets[WIDGET_AT(row, column)];
+    }
+
+    virtual void freeWidgets()
+    {
+        delete mPlayers;
+        mPlayers = 0;
+
+        delete_all(mWidgets);
+        mWidgets.clear();
+    }
+
+    std::string getPlayerAt(int index) const
+    {
+        return (*mPlayers)[index];
+    }
+
+protected:
+    std::vector<std::string> *mPlayers;
+    std::vector<gcn::Widget *> mWidgets;
+    PlayerRelationListModel *mListModel;
+};
+
+/**
+ * Class for choosing one of the various `what to do when ignoring a player' options
+ */
+class IgnoreChoicesListModel : public gcn::ListModel
+{
+public:
+    virtual ~IgnoreChoicesListModel() { }
+
+    virtual int getNumberOfElements()
+    {
+        return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
+                                ->size());
+    }
+
+    virtual std::string getElementAt(int i)
+    {
+        if (i >= getNumberOfElements() || i < 0)
+            return _("???");
+
+        return (*player_relations.getPlayerIgnoreStrategies())
+            [i]->mDescription;
+    }
+};
+
+#define ACTION_DELETE "delete"
+#define ACTION_OLD "old"
+#define ACTION_TABLE "table"
+#define ACTION_STRATEGY "strategy"
+#define ACTION_WHISPER_TAB "whisper tab"
+
+Setup_Relations::Setup_Relations():
+    mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
+    mPlayerTableModel(new PlayerTableModel),
+    mPlayerTable(new GuiTable(mPlayerTableModel)),
+    mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
+    mPlayerScrollArea(new ScrollArea(mPlayerTable)),
+    mDefaultTrading(new CheckBox(_("Allow trading"),
+                player_relations.getDefault() & PlayerRelation::TRADE)),
+    mDefaultWhisper(new CheckBox(_("Allow whispers"),
+                player_relations.getDefault() & PlayerRelation::WHISPER)),
+    mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
+    mOldButton(new Button(_("Old"), ACTION_OLD, this))
+{
+    setName(_("Relations"));
+
+    mPlayerTable->setOpaque(false);
+
+    mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH);
+    mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN,
+                                           RELATION_CHOICE_COLUMN_WIDTH);
+    mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
+
+    mIgnoreActionChoicesModel = new IgnoreChoicesListModel;
+    mIgnoreActionChoicesBox = new DropDown(mIgnoreActionChoicesModel);
+
+    for (int i = 0; i < COLUMNS_NR; i++)
+    {
+        mPlayerTableTitleModel->set(0, i,
+                new Label(gettext(table_titles[i])));
+    }
+
+    mPlayerTitleTable->setLinewiseSelection(true);
+
+    mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mPlayerTable->setActionEventId(ACTION_TABLE);
+    mPlayerTable->setLinewiseSelection(true);
+    mPlayerTable->addActionListener(this);
+
+    gcn::Label *ignore_action_label = new Label(_("When ignoring:"));
+
+    mIgnoreActionChoicesBox->setActionEventId(ACTION_STRATEGY);
+    mIgnoreActionChoicesBox->addActionListener(this);
+
+    int ignore_strategy_index = 0; // safe default
+
+    if (player_relations.getPlayerIgnoreStrategy())
+    {
+        ignore_strategy_index = player_relations.getPlayerIgnoreStrategyIndex(
+            player_relations.getPlayerIgnoreStrategy()->mShortName);
+        if (ignore_strategy_index < 0)
+            ignore_strategy_index = 0;
+    }
+    mIgnoreActionChoicesBox->setSelected(ignore_strategy_index);
+    mIgnoreActionChoicesBox->adjustHeight();
+
+    reset();
+
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, mPlayerTitleTable, 6);
+    place(0, 1, mPlayerScrollArea, 6, 4).setPadding(2);
+    place(0, 5, mDeleteButton);
+    place(1, 5, mOldButton, 1);
+    place(3, 5, ignore_action_label, 1);
+    place(4, 5, mIgnoreActionChoicesBox, 2).setPadding(2);
+    place(3, 6, mDefaultTrading, 3);
+    place(3, 7, mDefaultWhisper, 3);
+
+    player_relations.addListener(this);
+
+    setDimension(gcn::Rectangle(0, 0, 500, 350));
+}
+
+Setup_Relations::~Setup_Relations()
+{
+    player_relations.removeListener(this);
+    delete mIgnoreActionChoicesModel;
+    mIgnoreActionChoicesModel = 0;
+}
+
+
+void Setup_Relations::reset()
+{
+    // We now have to search through the list of ignore choices to find the
+    // current selection. We could use an index into the table of config
+    // options in player_relations instead of strategies to sidestep this.
+    int selection = 0;
+    for (unsigned int i = 0;
+                      i < player_relations.getPlayerIgnoreStrategies()->size();
+                      ++i)
+        if ((*player_relations.getPlayerIgnoreStrategies())[i] ==
+            player_relations.getPlayerIgnoreStrategy())
+        {
+
+            selection = i;
+            break;
+        }
+
+    mIgnoreActionChoicesBox->setSelected(selection);
+}
+
+void Setup_Relations::apply()
+{
+    player_relations.store();
+
+    unsigned int old_default_relations = player_relations.getDefault() &
+                                         ~(PlayerRelation::TRADE |
+                                           PlayerRelation::WHISPER);
+    player_relations.setDefault(old_default_relations
+                                | (mDefaultTrading->isSelected() ?
+                                       PlayerRelation::TRADE : 0)
+                                | (mDefaultWhisper->isSelected() ?
+                                       PlayerRelation::WHISPER : 0));
+
+    if (actorSpriteManager)
+        actorSpriteManager->updatePlayerNames();
+
+    if (player_node)
+        player_node->setCheckNameSetting(true);
+}
+
+void Setup_Relations::cancel()
+{
+}
+
+void Setup_Relations::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == ACTION_TABLE)
+    {
+        // temporarily eliminate ourselves: we are fully aware of this change,
+        // so there is no need for asynchronous updates.  (In fact, thouse
+        // might destroy the widet that triggered them, which would be rather
+        // embarrassing.)
+        player_relations.removeListener(this);
+
+        int row = mPlayerTable->getSelectedRow();
+        if (row >= 0)
+            mPlayerTableModel->updateModelInRow(row);
+
+        player_relations.addListener(this);
+
+    }
+    else if (event.getId() == ACTION_DELETE)
+    {
+        int player_index = mPlayerTable->getSelectedRow();
+
+        if (player_index < 0)
+            return;
+
+        std::string name = mPlayerTableModel->getPlayerAt(player_index);
+
+        player_relations.removePlayer(name);
+    }
+    else if (event.getId() == ACTION_OLD)
+    {
+        player_relations.load(true);
+        updateAll();
+    }
+    else if (event.getId() == ACTION_STRATEGY)
+    {
+        PlayerIgnoreStrategy *s =
+            (*player_relations.getPlayerIgnoreStrategies())[
+                mIgnoreActionChoicesBox->getSelected()];
+
+        player_relations.setPlayerIgnoreStrategy(s);
+    }
+}
+
+void Setup_Relations::updatedPlayer(const std::string &name A_UNUSED)
+{
+    mPlayerTableModel->playerRelationsUpdated();
+    mDefaultTrading->setSelected(
+            player_relations.getDefault() & PlayerRelation::TRADE);
+    mDefaultWhisper->setSelected(
+            player_relations.getDefault() & PlayerRelation::WHISPER);
+    if (player_node)
+        player_node->updateName();
+}
+
+void Setup_Relations::updateAll()
+{
+    PlayerTableModel *model = new PlayerTableModel();
+    mPlayerTable->setModel(model);
+    delete mPlayerTableModel;
+    mPlayerTableModel = model;
+    int ignore_strategy_index = 0; // safe default
+
+    if (player_relations.getPlayerIgnoreStrategy())
+    {
+        ignore_strategy_index = player_relations.getPlayerIgnoreStrategyIndex(
+                player_relations.getPlayerIgnoreStrategy()->mShortName);
+        if (ignore_strategy_index < 0)
+            ignore_strategy_index = 0;
+    }
+    mIgnoreActionChoicesBox->setSelected(ignore_strategy_index);
+    mIgnoreActionChoicesBox->adjustHeight();
+    reset();
+}
+void Setup_Relations::externalUpdated()
+{
+    mDefaultTrading->setSelected(
+        player_relations.getDefault() & PlayerRelation::TRADE);
+    mDefaultWhisper->setSelected(
+        player_relations.getDefault() & PlayerRelation::WHISPER);
+}
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
new file mode 100644
index 000000000..a6627a06d
--- /dev/null
+++ b/src/gui/setup_relations.h
@@ -0,0 +1,81 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_SETUP_RELATIONS_H
+#define GUI_SETUP_RELATIONS_H
+
+#include "guichanfwd.h"
+#include "playerrelations.h"
+
+#include "gui/widgets/setuptab.h"
+
+#include <guichan/actionlistener.hpp>
+
+#ifdef __GNUC__
+#define A_UNUSED  __attribute__ ((unused))
+#else
+#define A_UNUSED
+#endif
+
+class EditDialog;
+class GuiTable;
+class PlayerTableModel;
+class StaticTableModel;
+
+class Setup_Relations : public SetupTab,
+                      public PlayerRelationsListener
+{
+public:
+    Setup_Relations();
+    virtual ~Setup_Relations();
+
+    void apply();
+    void cancel();
+
+    void reset();
+
+    void action(const gcn::ActionEvent &event);
+
+    virtual void updatedPlayer(const std::string &name);
+
+    virtual void updateAll();
+
+    virtual void externalUpdated();
+
+private:
+    StaticTableModel *mPlayerTableTitleModel;
+    PlayerTableModel *mPlayerTableModel;
+    GuiTable *mPlayerTable;
+    GuiTable *mPlayerTitleTable;
+    gcn::ScrollArea *mPlayerScrollArea;
+
+    gcn::CheckBox *mDefaultTrading;
+    gcn::CheckBox *mDefaultWhisper;
+
+    gcn::Button *mDeleteButton;
+    gcn::Button *mOldButton;
+
+    gcn::ListModel *mIgnoreActionChoicesModel;
+    gcn::DropDown *mIgnoreActionChoicesBox;
+};
+
+#endif
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 515e15611..05f8c7315 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -36,7 +37,7 @@
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/gettext.h"
 
@@ -50,6 +51,7 @@ const char* ACTION_BOLD_FONT = "bold font";
 const char* ACTION_PARTICLE_FONT = "particle font";
 const char* ACTION_HELP_FONT = "help font";
 const char* ACTION_SECURE_FONT = "secure font";
+const char* ACTION_JAPAN_FONT = "japan font";
 
 class NamesModel : public gcn::ListModel
 {
@@ -135,6 +137,7 @@ Setup_Theme::Setup_Theme():
     mParticleFont(config.getStringValue("particleFont")),
     mHelpFont(config.getStringValue("helpFont")),
     mSecureFont(config.getStringValue("secureFont")),
+    mJapanFont(config.getStringValue("japanFont")),
     mFontSize(config.getIntValue("fontSize"))
 {
     setName(_("Theme"));
@@ -145,6 +148,7 @@ Setup_Theme::Setup_Theme():
     mParticleFontLabel = new Label(_("Particle font"));
     mHelpFontLabel = new Label(_("Help font"));
     mSecureFontLabel = new Label(_("Secure font"));
+    mJapanFontLabel = new Label(_("Japanese font"));
     mThemesModel  = new ThemesModel();
     mFontsModel  = new FontsModel();
 
@@ -172,6 +176,10 @@ Setup_Theme::Setup_Theme():
     mSecureFontDropDown->setActionEventId(ACTION_SECURE_FONT);
     mSecureFontDropDown->addActionListener(this);
 
+    mJapanFontDropDown = new DropDown(mFontsModel);
+    mJapanFontDropDown->setActionEventId(ACTION_JAPAN_FONT);
+    mJapanFontDropDown->addActionListener(this);
+
     fontSizeLabel = new Label(_("Font size"));
     mFontSizeListModel = new FontSizeChoiceListModel;
     mFontSizeDropDown = new DropDown(mFontSizeListModel);
@@ -194,25 +202,30 @@ Setup_Theme::Setup_Theme():
         config.getStringValue("helpFont")));
     mSecureFontDropDown->setSelectedString(getFileName(
         config.getStringValue("secureFont")));
+    mJapanFontDropDown->setSelectedString(getFileName(
+        config.getStringValue("japanFont")));
 
     // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
 
-    place(0, 0, mThemeLabel, 10);
-    place(0, 1, mThemeDropDown, 6);
-    place(0, 2, fontSizeLabel, 10);
-    place(0, 3, mFontSizeDropDown, 6);
-    place(0, 4, mFontLabel, 10);
-    place(0, 5, mFontDropDown, 6);
-    place(0, 6, mBoldFontLabel, 10);
-    place(0, 7, mBoldFontDropDown, 6);
-    place(0, 8, mParticleFontLabel, 10);
-    place(0, 9, mParticleFontDropDown, 6);
-    place(0, 10, mHelpFontLabel, 10);
-    place(0, 11, mHelpFontDropDown, 6);
-    place(0, 12, mSecureFontLabel, 10);
-    place(0, 13, mSecureFontDropDown, 6);
+    place(0, 0, mThemeLabel, 5);
+    place(0, 1, fontSizeLabel, 5);
+    place(0, 2, mFontLabel, 5);
+    place(0, 3, mBoldFontLabel, 5);
+    place(0, 4, mParticleFontLabel, 5);
+    place(0, 5, mHelpFontLabel, 5);
+    place(0, 6, mSecureFontLabel, 5);
+    place(0, 7, mJapanFontLabel, 5);
+
+    place(6, 0, mThemeDropDown, 10);
+    place(6, 1, mFontSizeDropDown, 10);
+    place(6, 2, mFontDropDown, 10);
+    place(6, 3, mBoldFontDropDown, 10);
+    place(6, 4, mParticleFontDropDown, 10);
+    place(6, 5, mHelpFontDropDown, 10);
+    place(6, 6, mSecureFontDropDown, 10);
+    place(6, 7, mJapanFontDropDown, 10);
 
     place.getCell().matchColWidth(0, 0);
     place = h.getPlacer(0, 1);
@@ -261,6 +274,10 @@ void Setup_Theme::action(const gcn::ActionEvent &event)
     {
         mSecureFont = mSecureFontDropDown->getSelectedString();
     }
+    else if (event.getId() == ACTION_JAPAN_FONT)
+    {
+        mJapanFont = mJapanFontDropDown->getSelectedString();
+    }
 }
 
 void Setup_Theme::cancel()
@@ -271,6 +288,7 @@ void Setup_Theme::cancel()
     mParticleFont = getFileName(config.getStringValue("particleFont"));
     mHelpFont = getFileName(config.getStringValue("helpFont"));
     mSecureFont = getFileName(config.getStringValue("secureFont"));
+    mJapanFont = getFileName(config.getStringValue("japanFont"));
 }
 
 void Setup_Theme::apply()
@@ -289,6 +307,7 @@ void Setup_Theme::apply()
         || config.getValue("particleFont", "dejavusans.ttf") != mParticleFont
         || config.getValue("helpFont", "dejavusansmono.ttf") != mHelpFont
         || config.getValue("secureFont", "dejavusansmono.ttf") != mSecureFont
+        || config.getValue("japanFont", "mplus-1p-regular.ttf") != mJapanFont
         || config.getIntValue("fontSize")
         != static_cast<int>(mFontSizeDropDown->getSelected()) + 10)
     {
@@ -297,6 +316,7 @@ void Setup_Theme::apply()
         config.setValue("particleFont", "fonts/" + getFileName(mParticleFont));
         config.setValue("helpFont", "fonts/" + getFileName(mHelpFont));
         config.setValue("secureFont", "fonts/" + getFileName(mSecureFont));
+        config.setValue("japanFont", "fonts/" + getFileName(mJapanFont));
         config.setValue("fontSize", mFontSizeDropDown->getSelected() + 10);
         gui->updateFonts();
     }
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index 0d141c0a5..c803cc296 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -73,6 +74,10 @@ class Setup_Theme : public SetupTab
         DropDown *mSecureFontDropDown;
         std::string mSecureFont;
 
+        gcn::Label *mJapanFontLabel;
+        DropDown *mJapanFontDropDown;
+        std::string mJapanFont;
+
         FontSizeChoiceListModel *mFontSizeListModel;
         gcn::Label *fontSizeLabel;
         int mFontSize;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 3e5c56f64..03b485097 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -26,7 +26,7 @@
 #include "game.h"
 #include "graphics.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 #include "particle.h"
 
@@ -274,7 +274,6 @@ const char *Setup_Video::particleDetailToString(int detail)
 Setup_Video::Setup_Video():
     mFullScreenEnabled(config.getBoolValue("screen")),
     mOpenGLEnabled(config.getIntValue("opengl")),
-    mHwAccelEnabled(config.getBoolValue("hwaccel")),
     mCustomCursorEnabled(config.getBoolValue("customcursor")),
     mParticleEffectsEnabled(config.getBoolValue("particleeffects")),
     mPickupChatEnabled(config.getBoolValue("showpickupchat")),
@@ -282,16 +281,11 @@ Setup_Video::Setup_Video():
     mOpacity(config.getFloatValue("guialpha")),
     mFps(config.getIntValue("fpslimit")),
     mAltFps(config.getIntValue("altfpslimit")),
-    mAlphaCache(config.getBoolValue("alphaCache")),
-    mEnableMapReduce(config.getBoolValue("enableMapReduce")),
-    mAdjustPerfomance(config.getBoolValue("adjustPerfomance")),
-    mBeingOpacity(config.getBoolValue("beingopacity")),
     mSpeechMode(static_cast<Being::Speech>(
         config.getIntValue("speech"))),
     mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
-    mHwAccelCheckBox(new CheckBox(_("Hw acceleration"), mHwAccelEnabled)),
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"),
                           mCustomCursorEnabled)),
     mParticleEffectsCheckBox(new CheckBox(_("Particle effects"),
@@ -302,13 +296,6 @@ Setup_Video::Setup_Video():
     // TRANSLATORS: Refers to "Show own name"
     mPickupParticleCheckBox(new CheckBox(_("as particle"),
                             mPickupParticleEnabled)),
-    mAlphaCacheCheckBox(new CheckBox(_("Enable opacity cache"), mAlphaCache)),
-    mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"),
-        mEnableMapReduce)),
-    mAdjustPerfomanceCheckBox(new CheckBox(_("Auto adjust perfomance"),
-        mAdjustPerfomance)),
-    mBeingOpacityCheckBox(new CheckBox(_("Show beings transparency"),
-                          mBeingOpacity)),
     mSpeechSlider(new Slider(0, 3)),
     mSpeechLabel(new Label("")),
     mAlphaSlider(new Slider(0.1, 1.0)),
@@ -348,8 +335,6 @@ Setup_Video::Setup_Video():
 
     mAlphaSlider->setValue(mOpacity);
     mAlphaSlider->setWidth(90);
-    mAlphaCacheCheckBox->setEnabled(mOpenGLDropDown->getSelected() == 0);
-    mEnableMapReduceCheckBox->setEnabled(mOpenGLDropDown->getSelected() == 0);
 
     mFpsLabel->setCaption(mFps > 0 ? toString(mFps) : _("None"));
     mFpsLabel->setWidth(60);
@@ -381,9 +366,6 @@ Setup_Video::Setup_Video():
     mOverlayDetailField->setActionEventId("overlaydetailfield");
     mParticleDetailSlider->setActionEventId("particledetailslider");
     mParticleDetailField->setActionEventId("particledetailfield");
-    mAlphaCacheCheckBox->setActionEventId("alphaCache");
-    mEnableMapReduceCheckBox->setActionEventId("enableMapReduce");
-    mAdjustPerfomanceCheckBox->setActionEventId("adjustPerfomance");
     mOpenGLDropDown->setActionEventId("opengl");
 
     mModeList->addActionListener(this);
@@ -402,10 +384,6 @@ Setup_Video::Setup_Video():
     mParticleDetailField->addKeyListener(this);
     mOpenGLDropDown->addActionListener(this);
 
-    mAlphaCacheCheckBox->addKeyListener(this);
-    mEnableMapReduceCheckBox->addKeyListener(this);
-    mAdjustPerfomanceCheckBox->addKeyListener(this);
-
     mSpeechLabel->setCaption(speechModeToString(mSpeechMode));
     mSpeechSlider->setValue(mSpeechMode);
 
@@ -422,45 +400,40 @@ Setup_Video::Setup_Video():
     place(0, 0, scrollArea, 1, 5).setPadding(2);
     place(0, 5, mOpenGLDropDown, 1);
 
-    place(0, 6, mHwAccelCheckBox, 6);
-    place(0, 7, mAlphaCacheCheckBox, 6);
-    place(0, 8, mEnableMapReduceCheckBox, 6);
+//    place(0, 6, mHwAccelCheckBox, 6);
 
     place(1, 0, mFsCheckBox, 2);
 
     place(1, 1, mCustomCursorCheckBox, 3);
 
-    place(1, 2, mBeingOpacityCheckBox);
-    place(1, 3, mParticleEffectsCheckBox, 2);
-
-    place(1, 4, mPickupNotifyLabel, 4);
+    place(1, 2, mParticleEffectsCheckBox, 2);
 
-    place(1, 5, mPickupChatCheckBox, 1);
-    place(2, 5, mPickupParticleCheckBox, 2);
+    place(1, 3, mPickupNotifyLabel, 4);
 
-    place(0, 9, mAdjustPerfomanceCheckBox, 6);
+    place(1, 4, mPickupChatCheckBox, 1);
+    place(2, 4, mPickupParticleCheckBox, 2);
 
-    place(0, 10, mAlphaSlider);
-    place(1, 10, alphaLabel, 3);
+    place(0, 6, mAlphaSlider);
+    place(1, 6, alphaLabel, 3);
 
-    place(0, 11, mFpsSlider);
-    place(1, 11, mFpsCheckBox).setPadding(3);
-    place(2, 11, mFpsLabel).setPadding(1);
+    place(0, 7, mFpsSlider);
+    place(1, 7, mFpsCheckBox).setPadding(3);
+    place(2, 7, mFpsLabel).setPadding(1);
 
-    place(0, 12, mAltFpsSlider);
-    place(1, 12, mAltFpsLabel).setPadding(3);
+    place(0, 8, mAltFpsSlider);
+    place(1, 8, mAltFpsLabel).setPadding(3);
 
-    place(0, 13, mSpeechSlider);
-    place(1, 13, speechLabel);
-    place(2, 13, mSpeechLabel, 3).setPadding(2);
+    place(0, 9, mSpeechSlider);
+    place(1, 9, speechLabel);
+    place(2, 9, mSpeechLabel, 3).setPadding(2);
 
-    place(0, 14, mOverlayDetailSlider);
-    place(1, 14, overlayDetailLabel);
-    place(2, 14, mOverlayDetailField, 3).setPadding(2);
+    place(0, 10, mOverlayDetailSlider);
+    place(1, 10, overlayDetailLabel);
+    place(2, 10, mOverlayDetailField, 3).setPadding(2);
 
-    place(0, 15, mParticleDetailSlider);
-    place(1, 15, particleDetailLabel);
-    place(2, 15, mParticleDetailField, 3).setPadding(2);
+    place(0, 11, mParticleDetailSlider);
+    place(1, 11, particleDetailLabel);
+    place(2, 11, mParticleDetailField, 3).setPadding(2);
 
     int width = 600;
 
@@ -551,33 +524,20 @@ void Setup_Video::apply()
 
     mAltFpsSlider->setEnabled(mAltFps > 0);
 
-    config.setValue("hwaccel", mHwAccelCheckBox->isSelected());
-
     // FPS change
     config.setValue("fpslimit", mFps);
     config.setValue("altfpslimit", mAltFps);
 
-    config.setValue("alphaCache", mAlphaCacheCheckBox->isSelected());
-    config.setValue("enableMapReduce", mEnableMapReduceCheckBox->isSelected());
-    config.setValue("adjustPerfomance",
-        mAdjustPerfomanceCheckBox->isSelected());
-    config.setValue("beingopacity", mBeingOpacityCheckBox->isSelected());
-
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getBoolValue("screen");
     mCustomCursorEnabled = config.getBoolValue("customcursor");
     mParticleEffectsEnabled = config.getBoolValue("particleeffects");
-    mAlphaCache = config.getBoolValue("alphaCache");
-    mEnableMapReduce = config.getBoolValue("enableMapReduce");
-    mAdjustPerfomance = config.getBoolValue("adjustPerfomance");
-    mBeingOpacity = config.getBoolValue("beingopacity");
 
     mSpeechMode = static_cast<Being::Speech>(
         config.getIntValue("speech"));
     mOpacity = config.getFloatValue("guialpha");
     mOverlayDetail = config.getIntValue("OverlayDetail");
     mOpenGLEnabled = config.getIntValue("opengl");
-    mHwAccelEnabled = config.getBoolValue("hwaccel");
     mPickupChatEnabled = config.getBoolValue("showpickupchat");
     mPickupParticleEnabled = config.getBoolValue("showpickupparticle");
 }
@@ -587,7 +547,6 @@ void Setup_Video::cancel()
     mFpsCheckBox->setSelected(mFps > 0);
     mFsCheckBox->setSelected(mFullScreenEnabled);
     mOpenGLDropDown->setSelected(mOpenGLEnabled);
-    mHwAccelCheckBox->setSelected(mHwAccelEnabled);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
     mParticleEffectsCheckBox->setSelected(mParticleEffectsEnabled);
     mFpsSlider->setValue(mFps);
@@ -595,10 +554,6 @@ void Setup_Video::cancel()
     mAltFpsSlider->setValue(mAltFps);
     mAltFpsSlider->setEnabled(mAltFps > 0);
     mSpeechSlider->setValue(mSpeechMode);
-    mAlphaCacheCheckBox->setSelected(mAlphaCache);
-    mEnableMapReduceCheckBox->setSelected(mEnableMapReduce);
-    mAdjustPerfomanceCheckBox->setSelected(mAdjustPerfomance);
-    mBeingOpacityCheckBox->setSelected(mBeingOpacity);
     mAlphaSlider->setValue(mOpacity);
     mOverlayDetailSlider->setValue(mOverlayDetail);
     mParticleDetailSlider->setValue(mParticleDetail);
@@ -618,17 +573,11 @@ void Setup_Video::cancel()
     config.setValue("customcursor", mCustomCursorEnabled);
     config.setValue("particleeffects", mParticleEffectsEnabled);
     config.setValue("speech", static_cast<int>(mSpeechMode));
-    config.setValue("alphaCache", mAlphaCache);
-    config.setValue("enableMapReduce", mEnableMapReduce);
-    config.setValue("adjustPerfomance", mAdjustPerfomance);
-    config.setValue("beingopacity", mBeingOpacity);
     config.setValue("guialpha", mOpacity);
     Image::setEnableAlpha(mOpacity != 1.0f);
     config.setValue("opengl", mOpenGLEnabled);
-    config.setValue("hwaccel", mHwAccelEnabled);
     config.setValue("showpickupchat", mPickupChatEnabled);
     config.setValue("showpickupparticle", mPickupParticleEnabled);
-    mAlphaCacheCheckBox->setEnabled(mOpenGLDropDown->getSelected() == 0);
 }
 
 void Setup_Video::action(const gcn::ActionEvent &event)
@@ -761,12 +710,6 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         mAltFpsSlider->setValue(mAltFps);
         mAltFpsSlider->setEnabled(mAltFps > 0);
     }
-    else if (id == "opengl")
-    {
-        bool isSoftware = (mOpenGLDropDown->getSelected() == 0);
-        mAlphaCacheCheckBox->setEnabled(isSoftware);
-        mEnableMapReduceCheckBox->setEnabled(isSoftware);
-    }
 }
 
 void Setup_Video::externalUpdated()
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 9533877fb..509deb2fd 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -55,7 +55,6 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
     private:
         bool mFullScreenEnabled;
         int mOpenGLEnabled;
-        bool mHwAccelEnabled;
         bool mCustomCursorEnabled;
         bool mParticleEffectsEnabled;
         bool mPickupChatEnabled;
@@ -63,10 +62,6 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
         float mOpacity;
         int mFps;
         int mAltFps;
-        bool mAlphaCache;
-        bool mEnableMapReduce;
-        bool mAdjustPerfomance;
-        bool mBeingOpacity;
         Being::Speech mSpeechMode;
 
         ModeListModel *mModeListModel;
@@ -83,7 +78,6 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
         gcn::ListBox *mModeList;
         gcn::CheckBox *mFsCheckBox;
         gcn::DropDown *mOpenGLDropDown;
-        gcn::CheckBox *mHwAccelCheckBox;
         gcn::CheckBox *mCustomCursorCheckBox;
         gcn::CheckBox *mParticleEffectsCheckBox;
 
@@ -91,10 +85,6 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
         gcn::CheckBox *mPickupChatCheckBox;
         gcn::CheckBox *mPickupParticleCheckBox;
 
-        gcn::CheckBox *mAlphaCacheCheckBox;
-        gcn::CheckBox *mEnableMapReduceCheckBox;
-        gcn::CheckBox *mAdjustPerfomanceCheckBox;
-        gcn::CheckBox *mBeingOpacityCheckBox;
         gcn::Slider *mSpeechSlider;
         gcn::Label *mSpeechLabel;
         gcn::Slider *mAlphaSlider;
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 68ea57314..4311a04d2 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -803,3 +803,12 @@ int ShopWindow::sumAmount(Item *shopItem)
     }
     return sum;
 }
+
+bool ShopWindow::isShopEmpty()
+{
+    if (!mBuyShopItems || !mSellShopItems)
+        return true;
+    if (mBuyShopItems->empty() && mSellShopItems->empty())
+        return true;
+    return false;
+}
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index e07803225..e3fd9a5ca 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -133,6 +133,8 @@ class ShopWindow : public Window, public gcn::ActionListener,
 
         bool checkFloodCounter(int &counterTime);
 
+        bool isShopEmpty();
+
     private:
         void startTrade();
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 5b47a5494..ff57195a9 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/skilldialog.h"
 
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 #include "configuration.h"
 
@@ -152,7 +152,9 @@ public:
     SkillListBox(SkillModel *model):
         ListBox(model),
         mModel(model),
-        mPopup(new TextPopup())
+        mPopup(new TextPopup()),
+        mHighlightColor(Theme::getThemeColor(Theme::HIGHLIGHT)),
+        mTextColor(Theme::getThemeColor(Theme::TEXT))
     {
     }
 
@@ -187,8 +189,8 @@ public:
 
         Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
-        graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
-                           static_cast<int>(mAlpha * 255.0f)));
+        mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+        graphics->setColor(mHighlightColor);
         graphics->setFont(getFont());
 
         // Draw filled rectangle around the selected list element
@@ -199,7 +201,7 @@ public:
         }
 
         // Draw the list elements
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(mTextColor);
         for (int i = 0, y = 1;
              i < model->getNumberOfElements();
              ++i, y += getRowHeight())
@@ -239,6 +241,8 @@ public:
 private:
     SkillModel *mModel;
     TextPopup *mPopup;
+    gcn::Color mHighlightColor;
+    gcn::Color mTextColor;
 };
 
 class SkillTab : public Tab
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index adcfe4d70..e3aa69b30 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -25,7 +25,7 @@
 #include "guild.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "party.h"
 
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 1c41752f3..a5d95c7ff 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/specialswindow.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "gui/setup.h"
 #include "gui/theme.h"
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index e867ec4e8..a918e037d 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -1,10 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -26,6 +27,8 @@
 #include "gui/gui.h"
 #include "gui/palette.h"
 
+#include "gui/widgets/label.h"
+
 #include "textcommand.h"
 
 #include "graphics.h"
@@ -35,7 +38,6 @@
 #include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
 
 #include "debug.h"
 
@@ -43,7 +45,7 @@ SpellPopup::SpellPopup():
     Popup("SpellPopup")
 {
     // Item Name
-    mItemName = new gcn::Label;
+    mItemName = new Label;
     mItemName->setFont(boldFont);
     mItemName->setPosition(getPadding(), getPadding());
 
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 1b14e0e4c..69c47bf45 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -1,10 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index c4216013a..bb7a295ab 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -1,10 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -27,6 +28,7 @@
 #include "gui/palette.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/textbox.h"
 
@@ -49,51 +51,51 @@ StatusPopup::StatusPopup():
 
     const int fontHeight = getFont()->getHeight();
 
-    mMoveType = new gcn::Label;
+    mMoveType = new Label;
     mMoveType->setPosition(getPadding(), getPadding());
 
-    mCrazyMoveType = new gcn::Label;
+    mCrazyMoveType = new Label;
     mCrazyMoveType->setPosition(getPadding(), fontHeight + getPadding());
 
-    mMoveToTargetType = new gcn::Label;
+    mMoveToTargetType = new Label;
     mMoveToTargetType->setPosition(getPadding(),
         2 * fontHeight + getPadding());
 
-    mFollowMode = new gcn::Label;
+    mFollowMode = new Label;
     mFollowMode->setPosition(getPadding(),  3 * fontHeight + getPadding());
 
-    mAttackWeaponType = new gcn::Label;
+    mAttackWeaponType = new Label;
     mAttackWeaponType->setPosition(getPadding(),
         4 + 4 * fontHeight + getPadding());
 
-    mAttackType = new gcn::Label;
+    mAttackType = new Label;
     mAttackType->setPosition(getPadding(), 4 + 5 * fontHeight + getPadding());
 
-    mMagicAttackType = new gcn::Label;
+    mMagicAttackType = new Label;
     mMagicAttackType->setPosition(getPadding(),
         4 + 6 * fontHeight + getPadding());
 
-    mDropCounter = new gcn::Label;
+    mDropCounter = new Label;
     mDropCounter->setPosition(getPadding(), 8 + 7 * fontHeight + getPadding());
 
-    mPickUpType = new gcn::Label;
+    mPickUpType = new Label;
     mPickUpType->setPosition(getPadding(), 8 + 8 * fontHeight + getPadding());
 
-    mMapType = new gcn::Label;
+    mMapType = new Label;
     mMapType->setPosition(getPadding(), 12 + 9 * fontHeight + getPadding());
 
-    mImitationMode = new gcn::Label;
+    mImitationMode = new Label;
     mImitationMode->setPosition(getPadding(),
         16 + 10 * fontHeight + getPadding());
 
-    mAwayMode = new gcn::Label;
+    mAwayMode = new Label;
     mAwayMode->setPosition(getPadding(), 16 + 11 * fontHeight + getPadding());
 
-    mCameraMode = new gcn::Label;
+    mCameraMode = new Label;
     mCameraMode->setPosition(getPadding(),
         16 + 12 * fontHeight + getPadding());
 
-    mDisableGameModifiers = new gcn::Label;
+    mDisableGameModifiers = new Label;
     mDisableGameModifiers->setPosition(getPadding(),
         20 + 13 * fontHeight + getPadding());
 
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index d633fb1f6..802b077a6 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -1,10 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index b96720341..7ab2afa2d 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/statuswindow.h"
 
+#include "chatwindow.h"
 #include "configuration.h"
 #include "event.h"
 #include "equipment.h"
@@ -71,6 +72,14 @@ class AttrDisplay : public Container
         virtual Type getType()
         { return UNKNOWN; }
 
+        std::string getValue()
+        {
+            if (!mValue)
+                return "-";
+            else
+                return mValue->getCaption();
+        }
+
     protected:
         AttrDisplay(int id, const std::string &name);
 
@@ -228,6 +237,10 @@ StatusWindow::StatusWindow():
     mCharacterPointsLabel = new Label("C");
     place(0, 6, mCharacterPointsLabel, 5);
 
+    mCopyButton = new Button(_("Copy to chat"), "copy", this);
+
+    place(0, 5, mCopyButton);
+
     if (Net::getPlayerHandler()->canCorrectAttributes())
     {
         mCorrectionPointsLabel = new Label("C");
@@ -343,7 +356,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
 
                 if (!lvl)
                 {
-                    // possible server broken and dont send job level,
+                    // possible server broken and don't send job level,
                     // then we fixing it :)
                     if (exp.second < 20000)
                     {
@@ -359,7 +372,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
                 }
 
                 if (exp.first < oldExp && exp.second >= 20000)
-                {   // possible job level up. but server broken and dont send
+                {   // possible job level up. but server broken and don't send
                     // new job exp limit, we fixing it
                     lvl ++;
                     blocked = true;
@@ -876,7 +889,6 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
         col.r = 100;
         col.g = 100;
         col.b = 100;
-//        bar->setColor(new gcn::Color(100, 100, 100));
         bar->setColor(col);
     }
     else
@@ -885,11 +897,31 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
         col.r = 255;
         col.g = 255;
         col.b = 0;
-//        bar->setColor(new gcn::Color(255, 255, 0));
         bar->setColor(col);
     }
 }
 
+void StatusWindow::action(const gcn::ActionEvent &event)
+{
+    if (!chatWindow)
+        return;
+
+    if (event.getId() == "copy")
+    {
+        Attrs::iterator it = mAttrs.begin();
+        Attrs::iterator it_end = mAttrs.end();
+        std::string str;
+        while (it != it_end)
+        {
+            ChangeDisplay *attr = dynamic_cast<ChangeDisplay*>((*it).second);
+            if (attr)
+                str += attr->getValue() + " ";
+            ++ it;
+        }
+        chatWindow->addInputText(str);
+    }
+}
+
 AttrDisplay::AttrDisplay(int id, const std::string &name):
         mId(id),
         mName(name)
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 74eb2c401..44d052004 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -48,7 +48,9 @@ class VertContainer;
  *
  * \ingroup Interface
  */
-class StatusWindow : public Window, public Mana::Listener
+class StatusWindow : public Window,
+                     public gcn::ActionListener,
+                     public Mana::Listener
 {
     public:
         /**
@@ -77,6 +79,8 @@ class StatusWindow : public Window, public Mana::Listener
         void updateProgressBar(ProgressBar *bar, int id,
                                bool percent = true);
 
+        void action(const gcn::ActionEvent &event);
+
     private:
         static std::string translateLetter(char* letters);
 
@@ -97,6 +101,7 @@ class StatusWindow : public Window, public Mana::Listener
 
         gcn::Label *mCharacterPointsLabel;
         gcn::Label *mCorrectionPointsLabel;
+        gcn::Button *mCopyButton;
 
         typedef std::map<int, AttrDisplay*> Attrs;
         Attrs mAttrs;
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index b3a1440e1..8cf9fa398 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -37,7 +38,7 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/radiobutton.h"
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
 #include "gui/widgets/textfield.h"
 
 #include "configuration.h"
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index cb88b8160..236c42320 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 4114706a6..1ff601154 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -1,11 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2008-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -26,6 +26,9 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
+#include "gui/theme.h"
+
+#include "gui/widgets/label.h"
 
 #include "graphics.h"
 #include "units.h"
@@ -34,7 +37,6 @@
 #include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
 
 #include "debug.h"
 
@@ -43,13 +45,13 @@ TextPopup::TextPopup():
 {
     const int fontHeight = getFont()->getHeight();
 
-    mText1 = new gcn::Label;
+    mText1 = new Label;
     mText1->setPosition(getPadding(), getPadding());
 
-    mText2 = new gcn::Label;
+    mText2 = new Label;
     mText2->setPosition(getPadding(), fontHeight + 2 * getPadding());
 
-    mText3 = new gcn::Label;
+    mText3 = new Label;
     mText3->setPosition(getPadding(), (2 * fontHeight) + 2 * getPadding());
 
     add(mText1);
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index 898b53555..9ac041389 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -1,11 +1,11 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2008-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 92613a3b3..15554044d 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -26,7 +26,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/dye.h"
 #include "resources/image.h"
@@ -599,6 +599,7 @@ static int readColorType(const std::string &type)
         "TEXT",
         "SHADOW",
         "OUTLINE",
+        "BORDER",
         "PROGRESS_BAR",
         "BUTTON",
         "BUTTON_DISABLED",
@@ -608,11 +609,15 @@ static int readColorType(const std::string &type)
         "GUILD_CHAT_TAB",
         "GUILD_SOCIAL_TAB",
         "BACKGROUND",
+        "BACKGROUND_GRAY",
+        "SCROLLBAR_GRAY",
+        "DROPDOWN_SHADOW",
         "HIGHLIGHT",
         "TAB_FLASH",
         "TAB_PLAYER_FLASH",
         "SHOP_WARNING",
         "ITEM_EQUIPPED",
+        "ITEM_NOT_EQUIPPED",
         "CHAT",
         "GM",
         "PLAYER",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 120214232..4e6a64a6f 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -143,6 +143,7 @@ class Theme : public Palette, public ConfigListener
             TEXT = 0,
             SHADOW,
             OUTLINE,
+            BORDER,
             PROGRESS_BAR,
             BUTTON,
             BUTTON_DISABLED,
@@ -152,11 +153,15 @@ class Theme : public Palette, public ConfigListener
             GUILD_CHAT_TAB,
             GUILD_SOCIAL_TAB,
             BACKGROUND,
+            BACKGROUND_GRAY,
+            SCROLLBAR_GRAY,
+            DROPDOWN_SHADOW,
             HIGHLIGHT,
             TAB_FLASH,
             TAB_PLAYER_FLASH,
             SHOP_WARNING,
             ITEM_EQUIPPED,
+            ITEM_NOT_EQUIPPED,
             CHAT,
             GM,
             PLAYER,
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index c607636d9..d00fb61f4 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -246,8 +246,11 @@ void TradeWindow::receivedOk(bool own)
     }
 }
 
-void TradeWindow::tradeItem(Item *item, int quantity)
+void TradeWindow::tradeItem(Item *item, int quantity, bool check)
 {
+    if (check && !checkItem(item))
+        return;
+
     Net::getTradeHandler()->addItem(item, quantity);
 }
 
@@ -325,15 +328,9 @@ void TradeWindow::action(const gcn::ActionEvent &event)
         if (mMyInventory->getFreeSlot() == -1)
             return;
 
-        if (mMyInventory->contains(item))
-        {
-            if (localChatTab)
-            {
-                localChatTab->chatLog(_("Failed adding item. You can not "
-                    "overlap one kind of item on the window."), BY_SERVER);
-            }
+
+        if (!checkItem(item))
             return;
-        }
 
         // Choose amount of items to trade
         ItemAmountWindow::showWindow(ItemAmountWindow::TradeAdd, this, item);
@@ -442,3 +439,21 @@ void TradeWindow::initTrade(std::string nick)
     if (!player_relations.isGoodName(nick))
         setCaptionFont(gui->getSecureFont());
 }
+
+bool TradeWindow::checkItem(Item *item)
+{
+    Item *tradeItem = mMyInventory->findItem(
+        item->getId(), item->getColor());
+
+    if (tradeItem && (tradeItem->getQuantity() > 1
+        || item->getQuantity() > 1))
+    {
+        if (localChatTab)
+        {
+            localChatTab->chatLog(_("Failed adding item. You can not "
+                "overlap one kind of item on the window."), BY_SERVER);
+        }
+        return false;
+    }
+    return true;
+}
diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h
index 3c5ed56b0..16b3d9d6f 100644
--- a/src/gui/tradewindow.h
+++ b/src/gui/tradewindow.h
@@ -95,7 +95,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         /**
          * Send trade packet.
          */
-        void tradeItem(Item *item, int quantity);
+        void tradeItem(Item *item, int quantity, bool check = false);
 
         /**
          * Updates the labels and makes sure only one item is selected in
@@ -131,6 +131,8 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         std::string getAutoTradeNick()
         { return mAutoAddToNick; }
 
+        bool checkItem(Item *item);
+
     private:
         enum Status
         {
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 8f845e746..568e0613e 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -23,7 +23,7 @@
 #include "gui/unregisterdialog.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/okdialog.h"
 #include "gui/register.h"
diff --git a/src/gui/updatewindow.cpp b/src/gui/updaterwindow.cpp
index eb5471e2a..7534b12a9 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -20,11 +20,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/updatewindow.h"
+#include "gui/updaterwindow.h"
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "gui/sdlinput.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updaterwindow.h
index a1dc556d5..a1dc556d5 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updaterwindow.h
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 40dddc4f1..eac9559ef 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -25,7 +25,7 @@
 
 #include "configuration.h"
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ba8414699..a5b541a8e 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -36,7 +36,7 @@
 #include "gui/beingpopup.h"
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 #include "gui/popupmenu.h"
 #include "gui/statuspopup.h"
 #include "gui/textpopup.h"
@@ -145,8 +145,10 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mScrollLaziness < 1)
         mScrollLaziness = 1; // Avoids division by zero
 
+    int cnt = 0;
+
     // Apply lazy scrolling
-    while (lastTick < tick_time)
+    while (lastTick < tick_time && cnt < 32)
     {
         if (player_x > static_cast<int>(mPixelViewX) + mScrollRadius)
         {
@@ -172,19 +174,26 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
             - static_cast<int>(mPixelViewY) + mScrollRadius) /
             static_cast<float>(mScrollLaziness);
         }
-        lastTick++;
+        lastTick ++;
+        cnt ++;
     }
 
     // Auto center when player is off screen
-    if (player_x - static_cast<int>(mPixelViewX) > graphics->mWidth / 2
-        ||  static_cast<int>(mPixelViewX) - player_x > graphics->mWidth / 2
-        ||  static_cast<int>(mPixelViewY) - player_y
-        > graphics->getHeight() / 2
-        ||  player_y - static_cast<int>(mPixelViewY)
-        > graphics->getHeight() / 2)
+    if (cnt > 30 || player_x - static_cast<int>(mPixelViewX)
+        > graphics->mWidth / 2 || static_cast<int>(mPixelViewX)
+        - player_x > graphics->mWidth / 2 ||  static_cast<int>(mPixelViewY)
+        - player_y > graphics->getHeight() / 2 ||  player_y
+        - static_cast<int>(mPixelViewY) > graphics->getHeight() / 2)
     {
         mPixelViewX = static_cast<float>(player_x);
         mPixelViewY = static_cast<float>(player_y);
+        if (player_x <= 0 || player_y <= 0)
+        {
+            if (debugChatTab)
+                debugChatTab->chatLog("incorrect player position!");
+            logger->log("incorrect player position: %d, %d",
+                player_x, player_y);
+        }
     };
 
     // Don't move camera so that the end of the map is on screen
@@ -684,7 +693,8 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
     const int y = getMouseY() + static_cast<int>(mPixelViewY);
 
     mHoverBeing = actorSpriteManager->findBeingByPixel(x, y, true);
-    if (mHoverBeing && mHoverBeing->getType() == Being::PLAYER)
+    if (mHoverBeing && (mHoverBeing->getType() == Being::PLAYER
+        || mHoverBeing->getType() == Being::NPC))
     {
         mTextPopup->setVisible(false);
         if (mShowBeingPopup)
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 9c1a71478..99da53c66 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index 644121d08..72063b183 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 748e038e2..d4764cba5 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -66,6 +66,9 @@ AvatarListBox::AvatarListBox(AvatarListModel *model):
 
     config.addListener("showgender", this);
     config.addListener("showlevel", this);
+
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 AvatarListBox::~AvatarListBox()
@@ -102,8 +105,8 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
 
     Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
-    graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
-        static_cast<int>(mAlpha * 255.0f)));
+    mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+    graphics->setColor(mHighlightColor);
     graphics->setFont(getFont());
 
     const int fontHeight = getFont()->getHeight();
@@ -113,7 +116,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
     const std::string name = player_node->getName();
 
     // Draw the list elements
-    graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+    graphics->setColor(getForegroundColor());
     for (int i = 0, y = 0;
          i < model->getNumberOfElements();
          ++i, y += fontHeight)
@@ -206,7 +209,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
 
                 if (a->getLevel() > 1)
                 {
-                    graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+                    graphics->setColor(getForegroundColor());
                     int minHp = 40 + ((a->getLevel() - 1) * 5);
                     if (minHp < 0)
                         minHp = 40;
@@ -242,28 +245,48 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
             }
         }
 
-        if (mShowGender)
+        if (graphics->getSecure())
         {
-            switch (a->getGender())
+            if (mShowGender)
             {
-                case GENDER_FEMALE:
-                    text += strprintf(" \u2640 %s",
-                        a->getAdditionString().c_str());
-                    break;
-                case GENDER_MALE:
-                    text += strprintf(" \u2642 %s",
-                        a->getAdditionString().c_str());
-                    break;
-                default:
-                    break;
+                switch (a->getGender())
+                {
+                    case GENDER_FEMALE:
+                        text += strprintf(" \u2640 ");
+                        break;
+                    case GENDER_MALE:
+                        text += strprintf(" \u2642 ");
+                        break;
+                    default:
+                        break;
+                }
             }
         }
         else
         {
-            text += a->getAdditionString();
+            if (mShowGender)
+            {
+                switch (a->getGender())
+                {
+                    case GENDER_FEMALE:
+                        text += strprintf(" \u2640 %s",
+                            a->getAdditionString().c_str());
+                        break;
+                    case GENDER_MALE:
+                        text += strprintf(" \u2642 %s",
+                            a->getAdditionString().c_str());
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                text += a->getAdditionString();
+            }
         }
 
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
 
         // Draw Name
         if (a->getType() == MapItem::SEPARATOR)
@@ -366,8 +389,10 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
     {
         if (ava->getType() == AVATAR_PLAYER && chatWindow)
         {
-            chatWindow->addWhisperTab(model->getAvatarAt(selected)
-                                      ->getName(), true);
+            ChatTab *tab = chatWindow->addWhisperTab(
+                model->getAvatarAt(selected)->getName(), true);
+            if (chatWindow && tab)
+                chatWindow->saveState();
         }
     }
 }
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 2fe1dfe3d..afb4abdf5 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -62,6 +62,7 @@ public:
 private:
     bool mShowGender;
     bool mShowLevel;
+    gcn::Color mHighlightColor;
 
     static int instances;
     static Image *onlineIcon;
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index e72c78ee0..c5500e801 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -22,10 +22,10 @@
 
 #include "gui/widgets/battletab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "gui/theme.h"
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 140a72770..bb83c1159 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -25,7 +25,7 @@
 
 #include "client.h"
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 
@@ -64,6 +64,10 @@ BrowserBox::BrowserBox(unsigned int mode, bool opaque):
 {
     setFocusable(true);
     addMouseListener(this);
+
+    mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    mHyperLinkColor = Theme::getThemeColor(Theme::HYPERLINK);
 }
 
 BrowserBox::~BrowserBox()
@@ -310,7 +314,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
 
     if (mOpaque)
     {
-        graphics->setColor(Theme::getThemeColor(Theme::BACKGROUND));
+        graphics->setColor(mBackgroundColor);
         graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
     }
 
@@ -319,7 +323,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
     {
         if ((mHighMode & BACKGROUND))
         {
-            graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT));
+            graphics->setColor(mHighlightColor);
             graphics->fillRectangle(gcn::Rectangle(
                 mLinks[mSelectedLink].x1,
                 mLinks[mSelectedLink].y1,
@@ -330,7 +334,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
 
         if ((mHighMode & UNDERLINE))
         {
-            graphics->setColor(Theme::getThemeColor(Theme::HYPERLINK));
+            graphics->setColor(mHyperLinkColor);
             graphics->drawLine(
                 mLinks[mSelectedLink].x1,
                 mLinks[mSelectedLink].y2,
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 6fdb40042..9969bfd3b 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -225,6 +225,10 @@ class BrowserBox : public gcn::Widget,
         bool mAlwaysUpdate;
         bool mProcessVersion;
         bool mEnableImages;
+
+        gcn::Color mBackgroundColor;
+        gcn::Color mHighlightColor;
+        gcn::Color mHyperLinkColor;
 };
 
 #endif
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0570630c3..7c46ae9df 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/palette.h"
 #include "gui/theme.h"
@@ -135,6 +135,9 @@ void Button::init()
         }
         updateAlpha();
     }
+    mEnabledColor = Theme::getThemeColor(Theme::BUTTON);
+    mDisabledColor = Theme::getThemeColor(Theme::BUTTON_DISABLED);
+
     mInstances++;
 }
 
@@ -202,7 +205,7 @@ void Button::draw(gcn::Graphics *graphics)
     }
     else
     {
-        // because we dont know where parent windows was moved,
+        // because we don't know where parent windows was moved,
         // need recalc vertexes
         gcn::ClipRectangle &rect = static_cast<Graphics*>(
             graphics)->getTopClip();
@@ -238,9 +241,9 @@ void Button::draw(gcn::Graphics *graphics)
 //        drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
 
     if (mode == BUTTON_DISABLED)
-        graphics->setColor(Theme::getThemeColor(Theme::BUTTON_DISABLED));
+        graphics->setColor(mDisabledColor);
     else
-        graphics->setColor(Theme::getThemeColor(Theme::BUTTON));
+        graphics->setColor(mEnabledColor);
 
     int textX;
     int textY = getHeight() / 2 - getFont()->getHeight() / 2;
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 8c43b6ddd..1b62179b3 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -101,6 +101,8 @@ class Button : public gcn::Button, public gcn::WidgetListener
         int mMode;
         int mXOffset;
         int mYOffset;
+        gcn::Color mEnabledColor;
+        gcn::Color mDisabledColor;
 };
 
 #endif
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 42a39a20f..81c0d277f 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -23,11 +23,11 @@
 #include "gui/widgets/chattab.h"
 
 #include "actorspritemanager.h"
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "sound.h"
 
 #include "gui/widgets/browserbox.h"
@@ -249,12 +249,13 @@ void ChatTab::chatLog(std::string line, Own own,
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() >=
+    if (mScrollArea->getVerticalScrollAmount() + 2 >=
         mScrollArea->getVerticalMaxScroll())
     {
         addRow(line);
         mScrollArea->setVerticalScrollAmount(
             mScrollArea->getVerticalMaxScroll());
+
     }
     else
     {
@@ -282,9 +283,7 @@ void ChatTab::chatLog(std::string line, Own own,
             {
                 if (player_node)
                 {
-                    std::string::size_type pos
-                        = tmp.text.find(player_node->getName());
-                    if (pos != std::string::npos)
+                    if (chatWindow && chatWindow->findHighlight(tmp.text))
                         setFlash(2);
                     else
                         setFlash(1);
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 61e5d9118..65d26e196 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -86,6 +86,8 @@ CheckBox::CheckBox(const std::string &caption, bool selected,
 
     if (listener)
         addActionListener(listener);
+
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 CheckBox::~CheckBox()
@@ -114,7 +116,7 @@ void CheckBox::draw(gcn::Graphics* graphics)
     drawBox(graphics);
 
     graphics->setFont(getFont());
-    graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+    graphics->setColor(getForegroundColor());
 
     const int h = getHeight() + getHeight() / 2;
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 3ade3b37f..46240f76d 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -22,7 +22,7 @@
 
 #include "configuration.h"
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "gui/palette.h"
@@ -53,8 +53,12 @@ Desktop::Desktop() :
         mVersionLabel = new Label(strprintf("%s (Mana %s)", appName.c_str(),
                                             FULL_VERSION));
 
-    mVersionLabel->setBackgroundColor(gcn::Color(255, 255, 255, 128));
+    mVersionLabel->setBackgroundColor(
+        Theme::getThemeColor(Theme::BACKGROUND, 128));
     add(mVersionLabel, 25, 2);
+
+    mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND, 128);
+    mBackgroundGrayColor = Theme::getThemeColor(Theme::BACKGROUND_GRAY);
 }
 
 Desktop::~Desktop()
@@ -84,8 +88,7 @@ void Desktop::draw(gcn::Graphics *graphics)
     if (!mWallpaper || (getWidth() > mWallpaper->getWidth() ||
         getHeight() > mWallpaper->getHeight()))
     {
-        // TODO: Color from palette
-        g->setColor(gcn::Color(64, 64, 64));
+        g->setColor(mBackgroundGrayColor);
         g->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
     }
 
@@ -106,7 +109,7 @@ void Desktop::draw(gcn::Graphics *graphics)
     }
 
     // Draw a thin border under the application version...
-    g->setColor(gcn::Color(255, 255, 255, 128));
+    g->setColor(mBackgroundColor);
     g->fillRectangle(gcn::Rectangle(mVersionLabel->getDimension()));
 
     Container::draw(graphics);
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 962cc3c01..6364ecfe9 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -68,6 +68,8 @@ class Desktop : public Container, gcn::WidgetListener
 
         Image *mWallpaper;
         gcn::Label *mVersionLabel;
+        gcn::Color mBackgroundColor;
+        gcn::Color mBackgroundGrayColor;
 };
 
 #endif // DESKTOP_H
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 681d7736e..f01d3fb55 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -101,6 +101,10 @@ DropDown::DropDown(gcn::ListModel *listModel):
     }
 
     instances++;
+
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    mShadowColor = Theme::getThemeColor(Theme::DROPDOWN_SHADOW);
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 DropDown::~DropDown()
@@ -163,25 +167,20 @@ void DropDown::draw(gcn::Graphics* graphics)
     updateAlpha();
 
     const int alpha = static_cast<int>(mAlpha * 255.0f);
-    gcn::Color faceColor = getBaseColor();
-    faceColor.a = alpha;
-    const gcn::Color *highlightColor = &Theme::getThemeColor(Theme::HIGHLIGHT,
-                                                             alpha);
-    gcn::Color shadowColor = faceColor - 0x303030;
-    shadowColor.a = alpha;
+    mHighlightColor.a = alpha;
+    mShadowColor.a = alpha;
 
     if (mListBox->getListModel() && mListBox->getSelected() >= 0)
     {
         graphics->setFont(getFont());
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
         graphics->drawText(mListBox->getListModel()->getElementAt(
                            mListBox->getSelected()), 1, 0);
     }
 
     if (isFocused())
     {
-        if (highlightColor)
-            graphics->setColor(*highlightColor);
+        graphics->setColor(mHighlightColor);
         graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth() - h, h));
     }
 
@@ -193,10 +192,9 @@ void DropDown::draw(gcn::Graphics* graphics)
 
         // Draw two lines separating the ListBox with selected
         // element view.
-        if (highlightColor)
-            graphics->setColor(*highlightColor);
+        graphics->setColor(mHighlightColor);
         graphics->drawLine(0, h, getWidth(), h);
-        graphics->setColor(shadowColor);
+        graphics->setColor(mShadowColor);
         graphics->drawLine(0, h + 1, getWidth(), h + 1);
     }
 }
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d85c3166c..6a22ba497 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -87,6 +87,9 @@ class DropDown : public gcn::DropDown
          */
         void drawButton(gcn::Graphics *graphics);
 
+        gcn::Color mShadowColor;
+        gcn::Color mHighlightColor;
+
         // Add own Images.
         static int instances;
         static Image *buttons[2][2];
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 257f4837c..b628cf2d4 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -72,6 +73,8 @@ DropShortcutContainer::DropShortcutContainer():
         mBoxHeight = 1;
         mBoxWidth = 1;
     }
+    mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+    mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
 }
 
 DropShortcutContainer::~DropShortcutContainer()
@@ -109,12 +112,6 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
         if (mBackgroundImg)
             g->drawImage(mBackgroundImg, itemX, itemY);
 
-/*        // Draw item keyboard shortcut.
-        const char *key = SDL_GetKeyName(
-            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_1 + i));
-        graphics->setColor(guiPalette->getColor(Palette::TEXT));
-        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
-*/
         if (dropShortcut->getItem(i) < 0)
             continue;
 
@@ -141,11 +138,11 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
                 image->setAlpha(1.0f);
                 g->drawImage(image, itemX, itemY);
                 if (item->isEquipped())
-                    g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
+                    g->setColor(mEquipedColor);
                 else
-                    g->setColor(Theme::getThemeColor(Theme::TEXT));
+                    g->setColor(mUnEquipedColor);
                 g->drawText(caption, itemX + mBoxWidth / 2,
-                            itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
+                    itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
             }
         }
     }
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 77de914ea..b2d63a7dd 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -83,6 +84,8 @@ class DropShortcutContainer : public ShortcutContainer
         Item *mItemMoved;
 
         ItemPopup *mItemPopup;
+        gcn::Color mEquipedColor;
+        gcn::Color mUnEquipedColor;
 };
 
 #endif
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index bb5af4b1c..5aced193f 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -29,7 +29,7 @@
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/palette.h"
 #include "gui/textpopup.h"
@@ -80,6 +80,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
         mBoxHeight = 1;
         mBoxWidth = 1;
     }
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 EmoteShortcutContainer::~EmoteShortcutContainer()
@@ -118,20 +119,9 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
         std::string key = keyboard.getKeyValueString(
             keyboard.KEY_EMOTE_1 + i);
 
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
         g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
 
-/*
-        if (emoteShortcut->getEmote(i)
-            && static_cast<unsigned>(emoteShortcut->getEmote(i)) - 1
-            < mEmoteImg.size()
-            && mEmoteImg[emoteShortcut->getEmote(i) - 1])
-        {
-            mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2,
-                                                            emoteY + 10);
-        }
-*/
-
         if (i < mEmoteImg.size() && mEmoteImg[i] && mEmoteImg[i]->sprite)
             mEmoteImg[i]->sprite->draw(g, emoteX + 2, emoteY + 10);
     }
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/guitable.cpp
index 04ae41ad7..e02eda88c 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
 
 #include "client.h"
 #include "configuration.h"
@@ -88,17 +88,17 @@ void GuiTableActionListener::action(const gcn::ActionEvent
 }
 
 
-GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
-                   bool opacity) :
+GuiTable::GuiTable(TableModel *initial_model, bool opacity) :
     mLinewiseMode(false),
     mWrappingEnabled(false),
     mOpaque(opacity),
-    mBackgroundColor(background),
     mModel(NULL),
     mSelectedRow(0),
     mSelectedColumn(0),
     mTopWidget(NULL)
 {
+    mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
     setModel(initial_model);
     setFocusable(true);
 
@@ -292,8 +292,8 @@ void GuiTable::draw(gcn::Graphics* graphics)
 
     if (mOpaque)
     {
-        graphics->setColor(Theme::getThemeColor(Theme::BACKGROUND,
-                           static_cast<int>(mAlpha * 255.0f)));
+        mBackgroundColor.a = static_cast<int>(mAlpha * 255.0f);
+        graphics->setColor(mBackgroundColor);
         graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
     }
 
@@ -304,7 +304,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
         first_row = 0;
 
     unsigned rows_nr = 1 + (getHeight() / getRowHeight()); // May overestimate
-                                                      // by one.
+                                                           // by one.
 
     unsigned max_rows_nr;
     if (mModel->getRows() < first_row)
@@ -343,8 +343,8 @@ void GuiTable::draw(gcn::Graphics* graphics)
 
                 widget->setDimension(bounds);
 
-                graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
-                        static_cast<int>(mAlpha * 255.0f)));
+                mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+                graphics->setColor(mHighlightColor);
 
                 if (mSelectedRow > 0)
                 {
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/guitable.h
index c4fab6a0d..d248c4820 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/guitable.h
@@ -58,7 +58,6 @@ class GuiTable : public gcn::Widget,
 
 public:
     GuiTable(TableModel * initial_model = NULL,
-             gcn::Color background = 0xffffff,
              bool opacity = true);
 
     virtual ~GuiTable();
@@ -190,6 +189,8 @@ private:
 
     /** Vector for compactness; used as a list in practice. */
     std::vector<GuiTableActionListener *> mActionListeners;
+
+    gcn::Color mHighlightColor;
 };
 
 
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 4a959190e..80014c171 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -41,8 +41,11 @@ class HorizontContainer : public Container, public gcn::WidgetListener
 {
     public:
         HorizontContainer(int height, int spacing);
+
         virtual void add(gcn::Widget *widget);
+
         virtual void clear();
+
         void widgetResized(const gcn::Event &event);
 
     protected:
diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp
index a220fdb98..795f0d31e 100644
--- a/src/gui/widgets/inventoryfilter.cpp
+++ b/src/gui/widgets/inventoryfilter.cpp
@@ -1,8 +1,8 @@
 /*
- *  The Mana Client
+ *  The ManaPlus Client
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana Client.
+ *  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
@@ -23,7 +23,7 @@
 #include "gui/widgets/horizontcontainer.h"
 #include "gui/widgets/radiobutton.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index da7b7af1e..be69489a8 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -1,9 +1,9 @@
 /*
- *  The Mana Client
+ *  The ManaPlus Client
  *  Copyright (C) 2009-2010  The Mana Developers
  *  Copyright (C) 2011  The ManaPlus Developers
  *
- *  This file is part of The Mana Client.
+ *  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
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 7818432f8..91b674018 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -27,7 +27,7 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "dropshortcut.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/itempopup.h"
@@ -118,6 +118,9 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
     if (!mSelImg)
         logger->log1("Error: Unable to load selection.png");
 
+    mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+    mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
+
     addKeyListener(this);
     addMouseListener(this);
     addWidgetListener(this);
@@ -204,15 +207,16 @@ void ItemContainer::draw(gcn::Graphics *graphics)
                 caption = "Eq.";
 
             if (item->isEquipped())
-                g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
+                g->setColor(mEquipedColor);
             else
-                g->setColor(gcn::Color(0, 0, 0));
+                g->setColor(mUnEquipedColor);
 
             g->drawText(caption, itemX + BOX_WIDTH / 2,
                         itemY + BOX_HEIGHT - 14, gcn::Graphics::CENTER);
         }
     }
 
+/*
     // Draw an orange box around the selected item
     if (isFocused() && mHighlightedIndex != -1 && mGridColumns)
     {
@@ -221,6 +225,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
         g->setColor(gcn::Color(255, 128, 0));
         g->drawRectangle(gcn::Rectangle(itemX, itemY, BOX_WIDTH, BOX_HEIGHT));
     }
+*/
 }
 
 void ItemContainer::selectNone()
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 5fd897a29..df7de63ee 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -202,6 +202,8 @@ class ItemContainer : public gcn::Widget,
         typedef SelectionListenerList::iterator SelectionListenerIterator;
 
         SelectionListenerList mSelectionListeners;
+        gcn::Color mEquipedColor;
+        gcn::Color mUnEquipedColor;
 };
 
 #endif
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 328d5ae4d..79685fe45 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -77,6 +77,9 @@ ItemShortcutContainer::ItemShortcutContainer(unsigned number):
         mBoxHeight = 1;
         mBoxWidth = 1;
     }
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+    mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+    mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
 }
 
 ItemShortcutContainer::~ItemShortcutContainer()
@@ -119,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
         // Draw item keyboard shortcut.
         std::string key = keyboard.getKeyValueString(
             keyboard.KEY_SHORTCUT_1 + i);
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
 
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
 
@@ -154,14 +157,9 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
                     image->setAlpha(1.0f);
                     g->drawImage(image, itemX, itemY);
                     if (item->isEquipped())
-                    {
-                        g->setColor(Theme::getThemeColor(
-                            Theme::ITEM_EQUIPPED));
-                    }
+                        g->setColor(mEquipedColor);
                     else
-                    {
-                        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
-                    }
+                        g->setColor(mUnEquipedColor);
                     g->drawText(caption, itemX + mBoxWidth / 2,
                         itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
                 }
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 7eac431ec..e6b32c6f8 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -88,7 +88,8 @@ class ItemShortcutContainer : public ShortcutContainer
 
         ItemPopup *mItemPopup;
         SpellPopup *mSpellPopup;
+        gcn::Color mEquipedColor;
+        gcn::Color mUnEquipedColor;
 };
 
-//extern SpellManager *spellManager;
 #endif
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 16b813dd5..67e8bd12b 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -26,6 +26,7 @@
 
 Label::Label()
 {
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 Label::Label(const std::string &caption) :
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 274c17d61..382d169dc 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/widgets/layout.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include <cassert>
 
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index de8707406..53299ca46 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -41,6 +41,8 @@ float ListBox::mAlpha = 1.0;
 ListBox::ListBox(gcn::ListModel *listModel):
     gcn::ListBox(listModel)
 {
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 ListBox::~ListBox()
@@ -63,8 +65,8 @@ void ListBox::draw(gcn::Graphics *graphics)
 
     updateAlpha();
 
-    graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
-            static_cast<int>(mAlpha * 255.0f)));
+    mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+    graphics->setColor(mHighlightColor);
     graphics->setFont(getFont());
 
     const int height = getRowHeight();
@@ -77,7 +79,7 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 
     // Draw the list elements
-    graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+    graphics->setColor(getForegroundColor());
     for (int i = 0, y = 0; i < mListModel->getNumberOfElements();
          ++i, y += height)
     {
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 5f8c20059..418b83f58 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -73,6 +73,7 @@ class ListBox : public gcn::ListBox
         void mouseDragged(gcn::MouseEvent &event);
 
     protected:
+        gcn::Color mHighlightColor;
         static float mAlpha;
 };
 
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index ea51c146a..38088770b 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/theme.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index a82ec3e8d..e641be323 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -46,6 +46,7 @@ RadioButton::RadioButton(const std::string &caption, const std::string &group,
     gcn::RadioButton(caption, group, marked),
     mHasMouse(false)
 {
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
     if (instances == 0)
     {
         radioNormal = Theme::getImageFromTheme("radioout.png");
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index df39854da..2796d3ab2 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/theme.h"
 
@@ -73,7 +73,6 @@ ScrollArea::ScrollArea(gcn::Widget *widget):
     mDrawWidth(0),
     mDrawHeight(0)
 {
-//    addWidgetListener(this);
     init();
 }
 
@@ -219,6 +218,9 @@ void ScrollArea::init()
     }
 
     instances++;
+
+    mGray = Theme::getThemeColor(Theme::SCROLLBAR_GRAY, 32);
+    mBackground = Theme::getThemeColor(Theme::BACKGROUND);
 }
 
 void ScrollArea::logic()
@@ -336,7 +338,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
         }
         else
         {
-            // because we dont know where parent windows was moved,
+            // because we don't know where parent windows was moved,
             // need recalc vertexes
             gcn::ClipRectangle &rect = static_cast<Graphics*>(
                 graphics)->getTopClip();
@@ -439,17 +441,17 @@ void ScrollArea::drawRightButton(gcn::Graphics *graphics)
 void ScrollArea::drawVBar(gcn::Graphics *graphics)
 {
     const gcn::Rectangle dim = getVerticalBarDimension();
-    graphics->setColor(gcn::Color(0, 0, 0, 32));
+    graphics->setColor(mGray);
     graphics->fillRectangle(dim);
-    graphics->setColor(gcn::Color(255, 255, 255));
+    graphics->setColor(mBackground);
 }
 
 void ScrollArea::drawHBar(gcn::Graphics *graphics)
 {
     const gcn::Rectangle dim = getHorizontalBarDimension();
-    graphics->setColor(gcn::Color(0, 0, 0, 32));
+    graphics->setColor(mGray);
     graphics->fillRectangle(dim);
-    graphics->setColor(gcn::Color(255, 255, 255));
+    graphics->setColor(mBackground);
 }
 
 void ScrollArea::drawVMarker(gcn::Graphics *graphics)
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 440fcec15..095010f3c 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -156,6 +156,9 @@ class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener
         int mYOffset;
         int mDrawWidth;
         int mDrawHeight;
+
+        gcn::Color mGray;
+        gcn::Color mBackground;
 };
 
 #endif
diff --git a/src/gui/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 182501e72..698e133dd 100644
--- a/src/gui/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -18,16 +18,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setupitem.h"
+#include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
 #include "main.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/editdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
+#include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
@@ -330,7 +331,6 @@ void SetupItemTextField::apply(std::string eventName)
     save();
 }
 
-
 SetupItemIntTextField::SetupItemIntTextField(std::string text,
                                              std::string description,
                                              std::string keyName,
@@ -454,6 +454,8 @@ void SetupItemIntTextField::apply(std::string eventName)
     save();
 }
 
+
+
 SetupItemLabel::SetupItemLabel(std::string text, std::string description,
                                SetupTabScroll *parent, bool separator) :
     SetupItem(text, description, "", parent, "", "", true),
@@ -505,3 +507,85 @@ void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED)
 void SetupItemLabel::apply(std::string eventName A_UNUSED)
 {
 }
+
+
+SetupItemDropDown::SetupItemDropDown(std::string text,
+                                     std::string description,
+                                     std::string keyName,
+                                     SetupTabScroll *parent,
+                                     std::string eventName,
+                                     gcn::ListModel *model,
+                                     bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, mainConfig),
+    mHorizont(0),
+    mLabel(0),
+    mModel(model),
+    mDropDown(0)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemDropDown::SetupItemDropDown(std::string text,
+                                     std::string description,
+                                     std::string keyName,
+                                     SetupTabScroll *parent,
+                                     std::string eventName,
+                                     gcn::ListModel *model,
+                                     std::string def,
+                                     bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+    mHorizont(0),
+    mLabel(0),
+    mModel(model),
+    mDropDown(0)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemDropDown::~SetupItemDropDown()
+{
+    mHorizont = 0;
+    mWidget = 0;
+    mModel = 0;
+    mDropDown = 0;
+    mLabel = 0;
+}
+
+void SetupItemDropDown::createControls()
+{
+    load();
+    mHorizont = new HorizontContainer(32, 2);
+
+    mLabel = new Label(mText);
+    mDropDown = new DropDown(mModel);
+    mDropDown->setActionEventId(mEventName);
+    mDropDown->addActionListener(mParent);
+
+    mWidget = mDropDown;
+//    mTextField->setWidth(50);
+    mHorizont->add(mLabel);
+    mHorizont->add(mDropDown);
+
+    mParent->getContainer()->add(mHorizont, true, 4);
+    mParent->addControl(this);
+    mParent->addActionListener(this);
+    mWidget->addActionListener(this);
+}
+
+void SetupItemDropDown::fromWidget()
+{
+    if (!mDropDown)
+        return;
+
+    mValue = mDropDown->getSelectedString();
+}
+
+void SetupItemDropDown::toWidget()
+{
+    if (!mDropDown)
+        return;
+
+    mDropDown->setSelectedString(mValue);
+}
diff --git a/src/gui/setupitem.h b/src/gui/widgets/setupitem.h
index 3396edea3..15d2d41ea 100644
--- a/src/gui/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -42,6 +42,7 @@
 class CheckBox;
 class Configuration;
 class ContainerPlacer;
+class DropDown;
 class EditDialog;
 class HorizontContainer;
 class IntTextField;
@@ -241,4 +242,32 @@ class SetupItemLabel : public SetupItem
         bool mIsSeparator;
 };
 
+class SetupItemDropDown : public SetupItem
+{
+    public:
+        SetupItemDropDown(std::string text, std::string description,
+                          std::string keyName, SetupTabScroll *parent,
+                          std::string eventName, gcn::ListModel *model,
+                          bool mainConfig = true);
+
+        SetupItemDropDown(std::string text, std::string description,
+                          std::string keyName, SetupTabScroll *parent,
+                          std::string eventName, gcn::ListModel *model,
+                          std::string def, bool mainConfig = true);
+
+        ~SetupItemDropDown();
+
+        void createControls();
+
+        void fromWidget();
+
+        void toWidget();
+
+    protected:
+        HorizontContainer *mHorizont;
+        Label *mLabel;
+        gcn::ListModel *mModel;
+        DropDown *mDropDown;
+};
+
 #endif
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index 805c0c8c7..30bb66469 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -20,10 +20,9 @@
 
 #include "gui/widgets/setuptabscroll.h"
 
-#include "gui/setupitem.h"
-
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
 #include "gui/widgets/vertcontainer.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index c5bcd88c4..e15445b77 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -43,6 +43,11 @@ int ShopItems::getNumberOfElements()
     return static_cast<int>(mShopItems.size());
 }
 
+bool ShopItems::empty()
+{
+    return mShopItems.empty();
+}
+
 std::string ShopItems::getElementAt(int i)
 {
     if (i < 0 || static_cast<unsigned>(i) >= mShopItems.size()
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index abfcffb71..29d24cb64 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -76,6 +76,8 @@ class ShopItems : public gcn::ListModel
          */
         int getNumberOfElements();
 
+        bool empty();
+
         /**
          * Returns the name of item number i in the shop.
          *
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 2fe28181b..793491808 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -50,9 +50,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel):
     mShopItems(0)
 {
     mRowHeight = getFont()->getHeight();
-    mPriceCheck = true;
-
-    mItemPopup = new ItemPopup;
+    init();
 }
 
 ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
@@ -61,9 +59,17 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
     mShopItems(shopListModel)
 {
     mRowHeight = std::max(getFont()->getHeight(), ITEM_ICON_SIZE);
-    mPriceCheck = true;
+    init();
+}
 
+void ShopListBox::init()
+{
+    mPriceCheck = true;
     mItemPopup = new ItemPopup;
+    mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+    mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+    mWarningColor = Theme::getThemeColor(Theme::SHOP_WARNING);
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 void ShopListBox::setPlayersMoney(int money)
@@ -80,8 +86,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
         mAlpha = Client::getGuiAlpha();
 
     int alpha = static_cast<int>(mAlpha * 255.0f);
-    const gcn::Color* highlightColor =
-            &Theme::getThemeColor(Theme::HIGHLIGHT, alpha);
+    mHighlightColor.a = alpha;
 
     Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
@@ -93,29 +98,30 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
          ++i, y += mRowHeight)
     {
         gcn::Color temp;
-        const gcn::Color* backgroundColor =
-                &Theme::getThemeColor(Theme::BACKGROUND, alpha);
+        gcn::Color* backgroundColor = &mBackgroundColor;
+        mBackgroundColor.a = alpha;
 
         if (mShopItems && mShopItems->at(i) &&
             mPlayerMoney < mShopItems->at(i)->getPrice() && mPriceCheck)
         {
             if (i != mSelected)
             {
-                backgroundColor = &Theme::getThemeColor(Theme::SHOP_WARNING,
-                                                        alpha);
+                backgroundColor = &mWarningColor;
+                backgroundColor->a = alpha;
             }
             else
             {
-                temp = Theme::getThemeColor(Theme::SHOP_WARNING, alpha);
-                temp.r = (temp.r + highlightColor->r) / 2;
-                temp.g = (temp.g + highlightColor->g) / 2;
-                temp.b = (temp.g + highlightColor->b) / 2;
+                temp = mWarningColor;
+                temp.r = (temp.r + mHighlightColor.r) / 2;
+                temp.g = (temp.g + mHighlightColor.g) / 2;
+                temp.b = (temp.g + mHighlightColor.b) / 2;
+                temp.a = alpha;
                 backgroundColor = &temp;
             }
         }
         else if (i == mSelected)
         {
-            backgroundColor = highlightColor;
+            backgroundColor = &mHighlightColor;
         }
 
         graphics->setColor(*backgroundColor);
@@ -130,9 +136,9 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
                 graphics->drawImage(icon, 1, y);
             }
         }
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
         graphics->drawText(mListModel->getElementAt(i), ITEM_ICON_SIZE + 5,
-                y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
+            y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
     }
 }
 
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 917f46729..38e238f20 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -85,6 +85,8 @@ class ShopListBox : public ListBox
         void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
 
     private:
+        void init();
+
         int mPlayerMoney;
 
         /**
@@ -100,6 +102,10 @@ class ShopListBox : public ListBox
         static float mAlpha;
 
         bool mPriceCheck;
+
+        gcn::Color mHighlightColor;
+        gcn::Color mBackgroundColor;
+        gcn::Color mWarningColor;
 };
 
 #endif // SHOPLISTBOX_H
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 0f4814429..8abe727b5 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -39,7 +40,7 @@
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "spellmanager.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 #include "textcommand.h"
@@ -80,6 +81,7 @@ SpellShortcutContainer::SpellShortcutContainer(unsigned number):
         mBoxHeight = 1;
         mBoxWidth = 1;
     }
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 SpellShortcutContainer::~SpellShortcutContainer()
@@ -105,11 +107,10 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
 
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    graphics->setColor(gcn::Color(0, 0, 0, 255));
     graphics->setFont(getFont());
 
     int selectedId = spellShortcut->getSelectedItem();
-    g->setColor(Theme::getThemeColor(Theme::TEXT));
+    g->setColor(getForegroundColor());
 
     for (unsigned i = 0; i < mMaxItems; i++)
     {
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 28016cbad..2155e2a8b 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 1b548a6a3..530f1ac82 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/palette.h"
 #include "gui/theme.h"
@@ -77,6 +77,8 @@ Tab::Tab() : gcn::Tab(),
     mMode(0)
 {
     init();
+    mFlashColor = Theme::getThemeColor(Theme::TAB_FLASH);
+    mPlayerFlashColor = Theme::getThemeColor(Theme::TAB_PLAYER_FLASH);
 }
 
 Tab::~Tab()
@@ -177,12 +179,10 @@ void Tab::draw(gcn::Graphics *graphics)
         switch (mFlash)
         {
             case 1:
-                mLabel->setForegroundColor(Theme::getThemeColor(
-                    Theme::TAB_FLASH));
+                mLabel->setForegroundColor(mFlashColor);
                 break;
             case 2:
-                mLabel->setForegroundColor(Theme::getThemeColor(
-                    Theme::TAB_PLAYER_FLASH));
+                mLabel->setForegroundColor(mPlayerFlashColor);
                 break;
             default:
                 break;
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 5847bd505..ba51e6c74 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -91,6 +91,8 @@ class Tab : public gcn::Tab, public gcn::WidgetListener
         GraphicsVertexes *mVertexes;
         bool mRedraw;
         int mMode;
+        gcn::Color mFlashColor;
+        gcn::Color mPlayerFlashColor;
 };
 
 #endif
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index d3539a115..940dad12a 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -25,7 +25,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tab.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include <guichan/widgets/container.hpp>
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index d3108a77f..2729e5407 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
@@ -59,6 +59,8 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab,
 
     mLoseFocusOnTab = loseFocusOnTab;
 
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+
     if (instances == 0)
     {
         // Load the skin
@@ -136,7 +138,7 @@ void TextField::draw(gcn::Graphics *graphics)
                   mXScroll);
     }
 
-    graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+    graphics->setColor(getForegroundColor());
     graphics->setFont(getFont());
     graphics->drawText(mText, 1 - mXScroll, 1);
 }
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index 99a145d86..deec2aea6 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -22,10 +22,10 @@
 
 #include "gui/widgets/tradetab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/theme.h"
 
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index d65274f20..ea6b4d520 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -49,7 +49,7 @@ void VertContainer::add(gcn::Widget *widget, bool resizable, int spacing)
     widget->setPosition(mLeftSpacing, mNextY);
     if (resizable)
     {
-        widget->setSize(getWidth() - mLeftSpacing, mVerticalItemSize);
+        widget->setSize(getWidth() - mLeftSpacing, mVerticalItemSize * 5);
         mResizableWidgets.push_back(widget);
     }
     else if (widget->getHeight() > mVerticalItemSize)
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index bee30b969..c99c4e0c5 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -22,10 +22,10 @@
 
 #include "gui/widgets/whispertab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/theme.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 14448ea86..cdb9d3d55 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/gui.h"
 #include "gui/palette.h"
@@ -95,6 +95,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent,
 
     addWidgetListener(this);
     mCaptionFont = getFont();
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 Window::~Window()
@@ -146,15 +147,10 @@ void Window::draw(gcn::Graphics *graphics)
 
     g->drawImageRect2(mVertexes, mSkin->getBorder());
 
-/*
-    g->drawImageRect(0, 0, getWidth(),
-            getHeight(), mSkin->getBorder());
-*/
-
     // Draw title
     if (mShowTitle)
     {
-        g->setColor(Theme::getThemeColor(Theme::TEXT));
+        g->setColor(getForegroundColor());
         g->setFont(mCaptionFont);
         g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index b63b83cd8..998e1f601 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
@@ -132,7 +132,7 @@ namespace gcn
          * @see remove, clear
          */
         virtual void clear();
-        
+
         /**
          * Draws the children widgets of the basic container.
          *
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 3ff40374a..f907b2cc2 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -22,7 +22,7 @@
 
 #include "inventory.h"
 #include "item.h"
-#include "log.h"
+#include "logger.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"
@@ -155,6 +155,9 @@ void Inventory::removeItemAt(int index)
 
 bool Inventory::contains(Item *item) const
 {
+    if (!item)
+        return false;
+
     for (unsigned i = 0; i < mSize; i++)
     {
         if (mItems[i] && mItems[i]->getId() == item->getId())
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 464eeda14..625e8d90a 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -193,8 +193,8 @@ void ItemShortcut::setItemSelected(Item *item)
 {
     if (item)
     {
-        logger->log("set selected id: %d", item->getId());
-        logger->log("set selected color: %d", item->getColor());
+//        logger->log("set selected id: %d", item->getId());
+//        logger->log("set selected color: %d", item->getColor());
         mItemSelected = item->getId();
         mItemColorSelected = item->getColor();
     }
diff --git a/src/joystick.cpp b/src/joystick.cpp
index f1255c4c0..8f808a2d1 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -22,7 +22,7 @@
 
 #include "configuration.h"
 #include "joystick.h"
-#include "log.h"
+#include "logger.h"
 
 #include <cassert>
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 8ad38ab76..bf58c518a 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -20,7 +20,7 @@
 
 #include "configuration.h"
 #include "keyboardconfig.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/sdlinput.h"
 #include "gui/setup_keyboard.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0310bb8ad..5192390bc 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -31,7 +31,7 @@
 #include "guild.h"
 #include "item.h"
 #include "keyboardconfig.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "party.h"
 #include "particle.h"
@@ -46,10 +46,11 @@
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
 #include "gui/killstats.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
 #include "gui/palette.h"
+#include "gui/shopwindow.h"
 #include "gui/skilldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
@@ -344,7 +345,7 @@ void LocalPlayer::logic()
     if (mEnableAdvert && !mBlockAdvert && mAdvertTime < cur_time)
     {
         Uint8 smile = FLAG_SPECIAL;
-        if (mTradebot)
+        if (mTradebot && shopWindow && !shopWindow->isShopEmpty())
             smile += FLAG_SHOP;
 
         if (mAwayMode)
@@ -3463,10 +3464,7 @@ void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment)
         if (target && target->getType() != Being::NPC)
         {
             mKeepAttacking = true;
-            if (mAttackWeaponType == 1)
-                moveToTarget();
-            else
-                moveToTarget(mAttackRange);
+            moveToTarget();
         }
     }
 }
diff --git a/src/log.cpp b/src/logger.cpp
index 9bcf1ea4f..6790d622a 100644
--- a/src/log.cpp
+++ b/src/logger.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "log.h"
+#include "logger.h"
 
 #include "configuration.h"
 
diff --git a/src/log.h b/src/logger.h
index b8517f696..c2fabb383 100644
--- a/src/log.h
+++ b/src/logger.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef M_LOG_H
-#define M_LOG_H
+#ifndef M_LOGGER_H
+#define M_LOGGER_H
 
 #include "main.h"
 #include <fstream>
diff --git a/src/main.cpp b/src/main.cpp
index faeedadaa..5c13b10ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,7 @@
 #include "utils/gettext.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include <libxml/parser.h>
 
diff --git a/src/main.h b/src/main.h
index dbe9b3142..9f8bbc6ac 100644
--- a/src/main.h
+++ b/src/main.h
@@ -26,12 +26,6 @@
 /**
  * \mainpage
  *
- * \section Introduction Introduction
- *
- * This is the documentation for the Mana client (http://manasource.org). It is
- * always a work in progress, with the intent to make it easier for new
- * developers to grow familiar with the source code.
- *
  * \section General General information
  *
  * During the game, the current Map is displayed by the main Viewport, which
@@ -91,8 +85,8 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.8.7"
-#define CHECK_VERSION "01.01.08.07"
+#define SMALL_VERSION "1.1.8.21"
+#define CHECK_VERSION "01.01.08.21"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
diff --git a/src/map.cpp b/src/map.cpp
index 8225aded1..721967b25 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 #include "particle.h"
 #include "simpleanimation.h"
 #include "tileset.h"
@@ -918,7 +918,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
         }
     }
 
-    // Dont draw if gui opacity == 1
+    // Don't draw if gui opacity == 1
     if (mBeingOpacity && mOpacity != 1.0f)
     {
         // Draws beings with a lower opacity to make them visible
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 456606406..bace077cd 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -1,9 +1,11 @@
-/* Code taken from: http://mumble.sourceforge.net/Link */
+/*
+ *Code taken from: http://mumble.sourceforge.net/Link
+ */
 
 #include "mumblemanager.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/mathutils.h"
 
diff --git a/src/mumblemanager.h b/src/mumblemanager.h
index a3eddee02..f7617233f 100644
--- a/src/mumblemanager.h
+++ b/src/mumblemanager.h
@@ -1,4 +1,6 @@
-/* Code taken from: http://mumble.sourceforge.net/Link */
+/*
+ * Code taken from: http://mumble.sourceforge.net/Link
+ */
 
 #ifndef MUMBLEMANAGER_H
 #define MUMBLEMANAGER_H
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 2d7eccebf..d063c4eb1 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -53,6 +53,7 @@ class AdminHandler
 
         virtual void mute(int playerId, int type, int limit) = 0;
 
+        virtual void warp(std::string map, int x, int y) = 0;
         // TODO
 };
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 89f972e6d..07279b148 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2004  The Mana World Development Team
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/net/download.cpp b/src/net/download.cpp
index c93f33c21..93417197e 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -22,7 +22,7 @@
 #include "net/download.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "utils/stringutils.h"
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 5440d14d0..bdd43b3f8 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -63,4 +63,10 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
     return; // Still looking into this
 }
 
+void AdminHandler::warp(std::string map, int x, int y)
+{
+    Net::getChatHandler()->talk(strprintf(
+        "@warp %s %d %d", map.c_str(), x, y));
+}
+
 } // namespace Ea
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 6f77c0e18..fcf1e25b2 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -51,6 +51,8 @@ class AdminHandler : public Net::AdminHandler
         virtual void unban(const std::string &name);
 
         virtual void mute(int playerId, int type, int limit);
+
+        virtual void warp(std::string map, int x, int y);
 };
 
 } // namespace Ea
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ee070593f..06e86f8a4 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -31,7 +31,7 @@
 #include "guild.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index c69d8a5be..a0e5b392a 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/ea/charserverhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index ea9d17798..c188a2204 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "localplayer.h"
 #include "playerrelations.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 0b6b8a040..04c13572f 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -26,7 +26,7 @@
 #include "event.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/okdialog.h"
 
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 037885fd1..ab030be83 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/gui/guildtab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "guild.h"
 #include "localplayer.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 02e0910a7..23eab361c 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/gui/partytab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index bb5cbe94b..0210a76ff 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -25,7 +25,7 @@
 #include "guild.h"
 #include "event.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/socialwindow.h"
 
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index acd674d12..01000f8f1 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -24,9 +24,9 @@
 
 #include "inventory.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 
 #include "net/messagein.h"
 
@@ -275,7 +275,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
 void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
 {
     int index, amount, itemId, equipType, refine;
-    int cards[4], itemType;
+//    int cards[4], itemType;
     unsigned char identified;
     int floorId;
 
@@ -296,9 +296,9 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
     msg.readInt8();  // attribute
     refine = msg.readInt8();
     for (int i = 0; i < 4; i++)
-        cards[i] = msg.readInt16();
+        msg.readInt16(); // cards[i]
     equipType = msg.readInt16();
-    itemType = msg.readInt8();
+    msg.readInt8(); // itemType
 
     const ItemInfo &itemInfo = ItemDB::get(itemId);
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 1f1f8d296..4be4ddaa6 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -25,7 +25,7 @@
 
 #include "equipment.h"
 #include "inventory.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 51502895c..9f7a5f07d 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/ea/loginhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 #include "configuration.h"
 
 #include "utils/dtor.h"
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index f720f9f96..045a2332b 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/socialwindow.h"
 
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 05b6cf9e3..4198c14ad 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "log.h"
+#include "logger.h"
 #include "party.h"
 #include "playerinfo.h"
 #include "units.h"
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 33fea3b27..4f0f22aed 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/specialhandler.h"
 
-#include "log.h"
+#include "logger.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 36a5f8811..a03782db2 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -25,7 +25,7 @@
 #include "event.h"
 #include "inventory.h"
 #include "item.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 #include "playerrelations.h"
 
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index 72e7c7ca8..2c76e99a3 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -91,4 +91,9 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
     // TODO
 }
 
+void AdminHandler::warp(std::string map, int x, int y)
+{
+    // TODO
+}
+
 } // namespace ManaServ
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index a91841085..65e9ea2b0 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -58,6 +58,8 @@ class AdminHandler : public Net::AdminHandler
         void unban(const std::string &name);
 
         void mute(int playerId, int type, int limit);
+
+        void warp(std::string map, int x, int y);
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp
index b48cc9eff..25c75f9d8 100644
--- a/src/net/manaserv/attributes.cpp
+++ b/src/net/manaserv/attributes.cpp
@@ -21,7 +21,7 @@
 
 #include "net/manaserv/attributes.h"
 
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/statuswindow.h"
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 23aae1f56..d14cdcadf 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -27,7 +27,7 @@
 #include "client.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "particle.h"
 
 #include "gui/okdialog.h"
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index c2611c64b..3b2306feb 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp
index 7f51aeb98..33d6f28cf 100644
--- a/src/net/manaserv/connection.cpp
+++ b/src/net/manaserv/connection.cpp
@@ -22,7 +22,7 @@
 
 #include "net/manaserv/connection.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/manaserv/internal.h"
 #include "net/manaserv/messageout.h"
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 3979a0fde..92cf66302 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -24,7 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "effectmanager.h"
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index dc3dbc616..306a15be4 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -24,7 +24,7 @@
 
 #include "event.h"
 #include "guild.h"
-#include "log.h"
+#include "logger.h"
 #include "localplayer.h"
 #include "channel.h"
 #include "channelmanager.h"
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 5e38354fb..ce837b5e1 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -38,7 +38,7 @@
 
 #include "resources/iteminfo.h"
 
-#include "log.h" // <<< REMOVE ME!
+#include "logger.h" // <<< REMOVE ME!
 
 extern Net::InventoryHandler *inventoryHandler;
 
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index 0afd12d21..89826a33f 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -29,7 +29,7 @@
 
 #include "game.h"
 #include "map.h"
-#include "log.h"
+#include "logger.h"
 
 namespace ManaServ
 {
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index e6109ca28..bf823562f 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/manaserv/loginhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "net/logindata.h"
 
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index e0ab7af78..53e83e4ec 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -22,7 +22,7 @@
 
 #include "net/manaserv/network.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/internal.h"
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 0e6af4578..987a40dc5 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/manaserv/partyhandler.h"
 
 #include "event.h"
-#include "log.h"
+#include "logger.h"
 #include "localplayer.h"
 
 #include "gui/socialwindow.h"
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index ca7fe511f..3dfddb436 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -27,7 +27,7 @@
 #include "effectmanager.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "particle.h"
 #include "playerinfo.h"
 #include "configuration.h"
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 8b5f2eee3..5bfeefdb6 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -24,7 +24,7 @@
 
 #include "net/packetcounters.h"
 
-#include "log.h"
+#include "logger.h"
 #include "net.h"
 
 #include "utils/stringutils.h"
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 3cdcb42e0..a8b66f5ae 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -24,7 +24,7 @@
 
 #include "net/packetcounters.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index a0d996dbf..a332b04fa 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -28,7 +28,7 @@
 #include "being.h"
 #include "event.h"
 #include "game.h"
-#include "log.h"
+#include "logger.h"
 #include "playerrelations.h"
 
 #include "net/chathandler.h"
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index d6f67f716..5016b2f8c 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -29,7 +29,7 @@
 #include "guild.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
@@ -552,7 +552,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
         dstBeing->setTileCoords(srcX, srcY);
         dstBeing->setDestination(dstX, dstY);
 
-        // because server dont send direction in move packet,
+        // because server don't send direction in move packet,
         // we fixing it
 
         if (srcX != dstX || srcY != dstY)
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index fe803dc62..7aa68e617 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 0f23f6412..90acf0f90 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -29,7 +29,7 @@
 #include "game.h"
 #include "localplayer.h"
 #include "playerrelations.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index cc0a37c57..242e9f9de 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -26,7 +26,7 @@
 #include "event.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 3e46fa66b..746cb6620 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/charselectdialog.h"
 #include "gui/inventorywindow.h"
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 99b775089..05a93bff8 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/gui/guildtab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "guild.h"
 #include "localplayer.h"
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index d15f4754f..373fcca31 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/gui/partytab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 43583971f..640a6fd78 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -23,7 +23,7 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "net/tmwa/messagein.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index ae79f6842..14a15e59f 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 405bacc43..9a0978bd0 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -23,7 +23,7 @@
 #ifndef NET_TA_INVENTORYHANDLER_H
 #define NET_TA_INVENTORYHANDLER_H
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/net.h"
 
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 15ed2f27c..029c379a0 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/tmwa/loginhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 #include "configuration.h"
 
 #include "net/messagein.h"
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 6e2fcc187..fb1986597 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -24,7 +24,7 @@
 
 #include "net/packetcounters.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index a904b6bbb..6071e0ab6 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -26,7 +26,7 @@
 
 #include "net/tmwa/network.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index c2049d3cc..8ecf04d36 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/network.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagehandler.h"
 #include "net/messagein.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 5bbf8baf3..7f942a206 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index f20ea64a0..c34c661e8 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/playerhandler.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index b175368bd..509c5ecd1 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/specialhandler.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 108b544a0..2280079ea 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -23,7 +23,7 @@
 #include "net/tmwa/tradehandler.h"
 
 #include "item.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "net/messagein.h"
diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp
index d40784aff..e93066b96 100644
--- a/src/opengl1graphics.cpp
+++ b/src/opengl1graphics.cpp
@@ -26,7 +26,7 @@
 #include "opengl1graphics.h"
 
 #include "graphicsvertexes.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 6081fa6b3..f918a5c0d 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -26,7 +26,7 @@
 
 #include "graphicsvertexes.h"
 #include "openglgraphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 
diff --git a/src/particle.cpp b/src/particle.cpp
index eca9307ea..7d7a73e9a 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "resources/dye.h"
 #include "imageparticle.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "particle.h"
 #include "particleemitter.h"
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index c04b1b36f..caa48a795 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -22,7 +22,7 @@
 
 #include "animationparticle.h"
 #include "imageparticle.h"
-#include "log.h"
+#include "logger.h"
 #include "particle.h"
 #include "particleemitter.h"
 #include "rotationalparticle.h"
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index 72b091244..3bb196921 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -26,7 +26,7 @@
 #include "event.h"
 #include "inventory.h"
 #include "listener.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
diff --git a/src/properties.h b/src/properties.h
index c65e30c22..19354b9ab 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -23,7 +23,7 @@
 #ifndef PROPERTIES_H
 #define PROPERTIES_H
 
-#include "log.h"
+#include "logger.h"
 #include <map>
 #include <sstream>
 #include <string>
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index ea7f44199..32b57b3b1 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/animation.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 6b4f57d81..8beea420d 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/beinginfo.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 72a5e4023..ed8c934dc 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -21,7 +21,7 @@
 #include "resources/colordb.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index fe7d4bcac..a782b6ec1 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/dye.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include <math.h>
 #include <sstream>
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 85a2993dd..b7f7d7901 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -21,7 +21,7 @@
 #include "resources/emotedb.h"
 
 #include "animatedsprite.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 #include "configuration.h"
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index b1f83e258..802f2ee12 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -31,7 +31,7 @@
 #endif
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "utils/stringutils.h"
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 1d41c6e63..5cf3e7d82 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/imageset.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 5d0bd9d94..e6f3c8c27 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/imagewriter.h"
 
-#include "log.h"
+#include "logger.h"
 
 #if defined __OpenBSD__
 #include <libpng/png.h>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 2d14ba687..e60127997 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -23,7 +23,7 @@
 #include "resources/itemdb.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
@@ -213,7 +213,7 @@ void ItemDB::load()
         std::string attackAction = XML::getProperty(node, "attack-action", "");
         std::string drawBefore = XML::getProperty(node, "drawBefore", "");
         std::string drawAfter = XML::getProperty(node, "drawAfter", "");
-        std::string removeSprite = XML::getProperty(node, "removeSprite", "");
+//        std::string removeSprite = XML::getProperty(node, "removeSprite", "");
         std::string colors;
         if (serverVersion >= 1)
             colors = XML::getProperty(node, "colors", "");
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 6658236f3..56cfc01f6 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -32,7 +32,7 @@
 
 #include "debug.h"
 
-
+/*
 ItemInfo::ItemInfo(ItemInfo &info)
 {
     mMissileParticleFile = info.mMissileParticleFile;
@@ -61,6 +61,7 @@ ItemInfo::ItemInfo(ItemInfo &info)
         mDrawPriority[f] = info.mDrawPriority[f];
     }
 }
+*/
 
 ItemInfo::ItemInfo() :
     mMissileParticleFile(""),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index daa9d590c..1fe8f3bad 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -107,7 +107,7 @@ class ItemInfo
          */
         ItemInfo();
 
-        ItemInfo(ItemInfo &info);
+//        ItemInfo(ItemInfo &info);
 
         ~ItemInfo();
 
diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp
index e8aeaf168..e7288e039 100644
--- a/src/resources/mapdb.cpp
+++ b/src/resources/mapdb.cpp
@@ -23,7 +23,7 @@
 
 #include "configuration.h"
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 35267533f..70c45054f 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -23,7 +23,7 @@
 #include "resources/mapreader.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "tileset.h"
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 7a0494fc9..dbf9d3e9a 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/monsterdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/net.h"
 
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index ccd1d9280..5ae9a2202 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/music.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "debug.h"
 
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 49eab5bf2..d04a2518f 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/npcdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/beinginfo.h"
 
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 6e986272a..b180712c1 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -23,7 +23,7 @@
 #include "resources/resource.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 92c18fa2a..ee325e253 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "resources/dye.h"
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index a01bf21a0..49e7adc31 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/soundeffect.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "debug.h"
 
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
index 4ab5e2a91..573ffb2a3 100644
--- a/src/resources/specialdb.cpp
+++ b/src/resources/specialdb.cpp
@@ -21,7 +21,7 @@
 
 #include "resources/specialdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 #include "utils/xml.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index b6addba77..dee93e1e7 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/spritedef.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 397b87993..09c9f2a04 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -23,7 +23,7 @@
 #include "resources/wallpaper.h"
 
 #include "resources/resourcemanager.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 #include "configuration.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index e3591f30c..4736b2e57 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -23,7 +23,7 @@
 #include "simpleanimation.h"
 
 #include "graphics.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/sound.cpp b/src/sound.cpp
index 92a5eaa6f..0a3c75d11 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "sound.h"
 
 #include "resources/resourcemanager.h"
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 29b99a9a0..a79388350 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -24,7 +25,7 @@
 
 #include "being.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
diff --git a/src/spellmanager.h b/src/spellmanager.h
index 931302e37..651ada56c 100644
--- a/src/spellmanager.h
+++ b/src/spellmanager.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp
index 8a8e55c21..2c5bd253d 100644
--- a/src/spellshortcut.cpp
+++ b/src/spellshortcut.cpp
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers.
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/spellshortcut.h b/src/spellshortcut.h
index 99f899eaa..047ccdef3 100644
--- a/src/spellshortcut.h
+++ b/src/spellshortcut.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
@@ -24,7 +25,7 @@
 #define SPELLSHORTCUT_H
 
 #include "spellmanager.h"
-#include "log.h"
+#include "logger.h"
 #include "utils/stringutils.h"
 
 class TextCommand;
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 27e351a45..dccf21f46 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -22,7 +22,7 @@
 
 #include "statuseffect.h"
 
-#include "log.h"
+#include "logger.h"
 #include "sound.h"
 
 #include "gui/widgets/chattab.h"
diff --git a/src/textcommand.cpp b/src/textcommand.cpp
index 836b3c653..665668c7e 100644
--- a/src/textcommand.cpp
+++ b/src/textcommand.cpp
@@ -1,9 +1,9 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/textcommand.h b/src/textcommand.h
index dbd621901..5ddbe824d 100644
--- a/src/textcommand.h
+++ b/src/textcommand.h
@@ -1,9 +1,10 @@
 /*
- *  The Mana World
+ *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011  ManaPlus developers
  *
- *  This file is part of The Mana World.
+ *  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
diff --git a/src/units.cpp b/src/units.cpp
index ee0647e2e..db9faadd1 100644
--- a/src/units.cpp
+++ b/src/units.cpp
@@ -22,7 +22,7 @@
 
 #include "units.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 #include "utils/xml.h"
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index f23ddc2aa..03dac2e7a 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -23,7 +23,7 @@
 #ifndef MUTEX_H
 #define MUTEX_H
 
-#include "log.h"
+#include "logger.h"
 
 #include <SDL_thread.h>
 
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 13170092e..0243c4315 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -181,9 +181,9 @@ unsigned long findI(std::string str, std::string subStr)
     return str.find(subStr);
 }
 
-unsigned long findI(std::string str, std::vector<std::string> &list)
+unsigned long findI(std::string &text, std::vector<std::string> &list)
 {
-    str = toLower(str);
+    std::string str = toLower(text);
     unsigned long idx;
     for (std::vector<std::string>::iterator i = list.begin();
          i != list.end(); ++i)
@@ -414,6 +414,19 @@ std::list<std::string> splitToStringList(const std::string &text,
     return tokens;
 }
 
+void splitToStringVector(std::vector<std::string> &tokens,
+                         const std::string &text, char separator)
+{
+    std::stringstream ss(text);
+    std::string item;
+    while(std::getline(ss, item, separator))
+    {
+        item = trim(item);
+        if (!item.empty())
+            tokens.push_back(item);
+    }
+}
+
 std::string combineDye(std::string file, std::string dye)
 {
     if (dye.empty())
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 94747d2fe..4fe6369e9 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -133,7 +133,7 @@ bool isWordSeparator(char chr);
 
 unsigned long findI(std::string str, std::string subStr);
 
-unsigned long findI(std::string str, std::vector<std::string> &list);
+unsigned long findI(std::string &text, std::vector<std::string> &list);
 
 const std::string encodeStr(unsigned int value, unsigned int size = 0);
 
@@ -176,6 +176,9 @@ std::list<int> splitToIntList(const std::string &text, char separator);
 std::list<std::string> splitToStringList(const std::string &text,
                                          char separator);
 
+void splitToStringVector(std::vector<std::string> &tokens,
+                         const std::string &text, char separator);
+
 std::string combineDye(std::string file, std::string dye);
 
 std::string combineDye2(std::string file, std::string dye);
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index b31b60ee1..89457a4e8 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -22,7 +22,7 @@
 
 #include "utils/xml.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/resourcemanager.h"
author	Reid <reidyaro@gmail.com>	2011-08-24 22:42:17 +0200
committer	Reid <reidyaro@gmail.com>	2011-08-24 22:42:17 +0200
commit	43c19a8321bd0c4bcf36655d74e895397aff7eea (patch)
tree	c8f7933367ae1e757a3166a04772274896d58c9c
parent	c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff)
parent	9505e3789cc9db6a10a68b9794a586604271b76f (diff)
download	plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2 plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip