update translations.

author: Andrei Karas <akaras@inbox.ru> 2014-09-22 22:27:28 +0300
committer: Andrei Karas <akaras@inbox.ru> 2014-09-22 22:27:28 +0300
commit: df9a0e97043897ee2919664067ed2e452a09c207 (patch)
tree: d605e019b3675917c1e00e094b8d6c45ac654675
parent: bad1fef12b5f113b7c05ab4c7f179002c3180dac (diff)
download: ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.gz
ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.bz2
ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.xz
ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.zip
39 files changed, 14122 insertions, 11959 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1bbf850de..93eb8b292 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,6 +34,7 @@ src/gui/userpalette.cpp
 src/gui/widgets/characterdisplay.cpp
 src/gui/widgets/itemcontainer.cpp
 src/gui/widgets/itemlinkhandler.cpp
+src/gui/widgets/selldialog.cpp
 src/gui/widgets/setupitem.cpp
 src/gui/widgets/skillinfo.cpp
 src/gui/widgets/tabs/battletab.cpp
@@ -82,6 +83,7 @@ src/gui/windows/debugwindow.cpp
 src/gui/windows/didyouknowwindow.cpp
 src/gui/windows/editdialog.cpp
 src/gui/windows/editserverdialog.cpp
+src/gui/windows/eggselectiondialog.cpp
 src/gui/windows/emotewindow.cpp
 src/gui/windows/equipmentwindow.cpp
 src/gui/windows/helpwindow.cpp
@@ -93,11 +95,11 @@ src/gui/windows/minimap.cpp
 src/gui/windows/ministatuswindow.cpp
 src/gui/windows/npcdialog.cpp
 src/gui/windows/npcpostdialog.cpp
+src/gui/windows/npcselldialog.cpp
 src/gui/windows/outfitwindow.cpp
 src/gui/windows/questswindow.cpp
 src/gui/windows/quitdialog.cpp
 src/gui/windows/registerdialog.cpp
-src/gui/windows/selldialog.cpp
 src/gui/windows/serverdialog.cpp
 src/gui/windows/setupwindow.cpp
 src/gui/windows/shopwindow.cpp
@@ -138,6 +140,7 @@ src/net/ea/skillhandler.cpp
 src/net/eathena/generalhandler.cpp
 src/net/eathena/loginhandler.cpp
 src/net/ea/tradehandler.cpp
+src/net/tmwa/charserverhandler.cpp
 src/net/tmwa/generalhandler.cpp
 src/render/rendererslistsdl2.h
 src/render/rendererslistsdl.h
diff --git a/po/ar.po b/po/ar.po
index 6aa848fc2..a671767dd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -4811,7 +4811,7 @@ msgstr "إنشاء"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -5734,7 +5734,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6230,66 +6230,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7813,7 +7818,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 7376bf73d..ad8e6d5cd 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr ""
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6218,66 +6218,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index a2840e076..cfe96e89f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -4808,7 +4808,7 @@ msgstr "Crear"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Sortir"
 
@@ -5723,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi"
 
@@ -6219,66 +6219,71 @@ msgstr "Apunta Jugador"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Agafa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr "Canvia el mode de recollir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Assentat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Activa/Desactiva Intercanvis"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr "Canviar mode de visionat de mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "Selecciona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7802,7 +7807,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s bol un intercanvi amb tu, acceptes?"
diff --git a/po/cs.po b/po/cs.po
index aa6e282fa..6ad50dbc9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-12 08:25+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-15 07:58+0000\n"
 "Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -39,7 +39,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -47,123 +47,123 @@ msgstr "Soubor byl uploadován"
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d týdnů"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdnů"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dní"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d hodin"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d vteřinu"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Nelze možné zaslat prázdné šeptání!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,109 +174,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Chybí jméno gildy."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hráč nemůže být zařazen jako %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr "Hráč již není smazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "přítel"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "přehlížený"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutrální"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "na černé listině"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "nepřítel"
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Člověk"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "uskočení"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Byl jsi zabit %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -371,43 +371,43 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -417,8 +417,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -445,37 +445,37 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -491,9 +491,9 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -501,32 +501,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -540,50 +540,50 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -623,36 +623,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1032,7 +1032,7 @@ msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Preješ si otevřít stránku podpory?"
 
@@ -1041,7 +1041,7 @@ msgstr "Preješ si otevřít stránku podpory?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "výchozí"
@@ -1203,8 +1203,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1455,7 +1455,7 @@ msgstr "Komentář: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
@@ -1478,28 +1478,28 @@ msgstr "Vytvořit partu"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1507,7 +1507,7 @@ msgid "Cancel"
 msgstr "Zrušit"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
@@ -1515,7 +1515,7 @@ msgstr "Váha: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Obchod"
@@ -1526,46 +1526,47 @@ msgstr "Obchod"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Útok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
@@ -1589,9 +1590,9 @@ msgstr "Vyhladit"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jdi sem"
@@ -1600,7 +1601,7 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Promluv"
@@ -1611,7 +1612,7 @@ msgstr "Promluv"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1621,12 +1622,12 @@ msgstr "Nákup"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1634,26 +1635,26 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Vyřadit ze seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Přidat do prioritního seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Přidat do seznamu útoku"
 
@@ -1661,7 +1662,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1669,44 +1670,44 @@ msgstr "Vložit do seznamu ignorovaných"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Označit na mapě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1716,20 +1717,20 @@ msgstr "Přejmenovat"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
@@ -1738,7 +1739,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1746,69 +1747,69 @@ msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Opustit"
 
@@ -1818,79 +1819,79 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -1899,64 +1900,64 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -1966,51 +1967,51 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2018,150 +2019,155 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitace"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2169,7 +2175,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Upustit"
@@ -2177,49 +2183,49 @@ msgstr "Upustit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Rozdělit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Vykopnout"
 
@@ -2237,7 +2243,7 @@ msgstr "Zkratky"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Okna"
@@ -2265,10 +2271,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Ostatní"
 
@@ -2324,7 +2330,7 @@ msgstr "Jména NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstra"
 
@@ -2507,25 +2513,130 @@ msgstr "Ob."
 msgid "Open url"
 msgstr "Otevři web adresu"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Ukončit"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Vše"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Cena: %s / Celkem %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Upravit"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
-#, c-format
-msgid "Mana: -%d"
-msgstr "Mana: -%d"
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Typ:"
 
+#. TRANSLATORS: Skill type
 #: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Neznámý."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Podpora botů"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Typ cíle:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Neznámý."
+
+#: src/gui/widgets/skillinfo.cpp:147
+#, fuzzy, c-format
+msgid " / Mana: -%d"
+msgstr "Mana: -%d"
+
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr "Dosah: %d"
@@ -3304,39 +3415,39 @@ msgid "No mods present"
 msgstr "Nejsou dostupné žádné modifikace"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Vždy zobrazit"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Automaticky schovat při malém rozlišení"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Vždy automaticky schovávat"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Systémové proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Přímé spojení"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "host SOCKS5"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3344,234 +3455,234 @@ msgstr "nízké"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "střední"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "vysoké"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Ostatní"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Zobrazit poškození způsobené monstrům"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Automaticky zaměřovat pouze dosažitelná monstra"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Zvýraznit útočný dosah monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Zobrazit u monster pruh s životy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Cyklovat zaměřená monstra"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Zvýraznit portály"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Zvýraznit portály na mapách"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Zvýraznit věci na zemi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Zvýraznit hráčův útočný dosah"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Zobrazit rozšířené minimapy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Vykreslovat cestu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Vykreslovat zkratky na mapě"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Zapnout líné rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Lenost rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Radius rolování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Automaticky měnit velikost minimap"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Zobrazovat animace mapy"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Pohyb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Automaticky upravit pozici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Zobrazovat pozici ze serveru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Útočit během pohybu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Útoč na další cíl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synchronizovat hráčův pohyb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Program A šílených pohybů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Pohyby relativní k myši (dobré pro dotyková rozhraní)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Hráč"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Zobrazit vlastní pruh životů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Zapnout rychlé statistiky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Cyklovat zaměřené hráče"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Zobrazovat zprávy o pracovních zkušenostech"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Zobrazovat bubliny hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Away zpráva"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Zobrazit práci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Povolit filtr útoku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Zapni filtr sběru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Povolit upozorňovací protokol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Povolit podporu mazlíčků"
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Povolit upozornění na váhu"
 
@@ -3579,173 +3690,179 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Akceptovat požadavky na koupi/prodej"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Přepínej NPC cíle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Podpora botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Povolit podporu aukčního robota"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Zpoždění opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Vlastní interval opakování"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Knoflíky zkratek"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Proxy server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Typ proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy adresa:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Povolit útok na straně serveru"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "Skrýt stránku podpory při chybě"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Povolit dvojklik"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Zapnout ochranu proti vadným serverům (nevypínej)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Ignorovaná jména"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Zapni OpenGL log"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Povolit záznam vstupu"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr "Uploadovat soubor se záznamem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Mód nízkého síťového provozu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Použít FBO pro zachycení obrazovky (pouze pro openGl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Složka pro snímky obrazovky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Zpoždění sítě mezi sub servery"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Vlastní nastavení hustoty obrazovky"
 
@@ -3984,7 +4101,7 @@ msgstr "Povolit šeptání"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4670,7 +4787,7 @@ msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -4681,7 +4798,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Společenství"
 
@@ -4775,75 +4892,19 @@ msgid "Create items"
 msgstr "Vytvořit předměty"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Cena: %s / Celkem %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Počet:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Vytvořit"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Ukončit"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Vše"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4865,19 +4926,19 @@ msgid "Type new email address twice:"
 msgstr "Zadej novou emailovou adresu dvakrát:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Nový email musí mít nejméně %u znaků."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Nový email musí mít méně než %u znaků."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Emailové adresy nesouhlasí."
 
@@ -4895,7 +4956,7 @@ msgstr "Změnit heslo"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Heslo:"
@@ -4906,29 +4967,29 @@ msgid "Type new password twice:"
 msgstr "Zadej nové heslo dvakrát:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Nejdřív zadej původní heslo."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Nové heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Nové heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Nová hesla nesouhlasí."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Nová postava"
 
@@ -4936,9 +4997,9 @@ msgstr "Nová postava"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -4946,11 +5007,11 @@ msgstr "Jméno:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4959,72 +5020,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Účes:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Žena"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Vzhled:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -5053,7 +5114,7 @@ msgstr "Přepnout přihlášení"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Hrát"
@@ -5061,36 +5122,36 @@ msgstr "Hrát"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Informace"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Změnit email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Účet %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr "Prosím nastavte nový pin kód"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5105,16 +5166,16 @@ msgstr ""
 "Zkušenost: %u\n"
 "Peníze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
@@ -5179,7 +5240,7 @@ msgstr "Upravit server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Připojit"
 
@@ -5214,10 +5275,23 @@ msgid "Online list url:"
 msgstr "Url online seznamu:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Prosím zadejte alespoň adresu a port serveru."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Vybrat"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Vybrat"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5438,8 +5512,8 @@ msgstr "Změnit server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrace"
 
@@ -5555,7 +5629,7 @@ msgstr "Odeslat"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5576,6 +5650,17 @@ msgstr "Odeslat"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. Odesílatel nebo dopis není platný."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "prodat předmět"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Opravdu chceš prodat %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5603,107 +5688,96 @@ msgid "Switch character"
 msgstr "Přepnout postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Potvrdit:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Jméno musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Jméno musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "prodat předmět"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Opravdu chceš prodat %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -5751,159 +5825,159 @@ msgstr "Aukce"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "H"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Název gildy"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do jeho party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -6102,7 +6176,7 @@ msgid "Completed"
 msgstr "Hotovo"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -6112,17 +6186,17 @@ msgid "Update"
 msgstr "Obnovit"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Kdo je přihlášený - Update"
 
@@ -6144,25 +6218,25 @@ msgstr "Vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -6170,7 +6244,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "n kl"
 
@@ -6246,71 +6320,77 @@ msgstr "Zaměřit hráče"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Catch pet"
-msgstr ""
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Rasa cíle:"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Catch pet"
+msgstr "Chytit mazlíčka"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Ostatní klávesy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Sebrat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sednout si"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Otevřít okno obchodu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr "Zahájit obchod se zacíleným"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr "Následovat vybraného hráče"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Vybrat OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Zastavit nebo posadit se"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Návrat k bezpečnému video módu"
 
@@ -6518,11 +6598,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Vybrat"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Vybrat2"
@@ -6869,6 +6944,11 @@ msgid "Upload server config"
 msgstr "Uploadovat nastavení serveru"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Klávesy výbav"
@@ -7243,94 +7323,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Síla:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Hbitost:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitalita:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Inteligence:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Obratnost:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Štěstí:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Nemohu použít toto ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Neznámá chyba postavy na serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Nesprávné statistiky."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Nesprávný účes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Nesprávný místo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Špatná rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Špatný vzhled."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -7477,43 +7527,43 @@ msgstr "Nové heslo je příliš krátké."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Odmítnutí od serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Klientský software je příliš starý."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7523,22 +7573,22 @@ msgstr ""
 "Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Špatný e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
@@ -7548,12 +7598,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Byla předána prázdná adresa pro Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Nebylo možné vyhledat host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Spojení se serverem ukončeno. "
 
@@ -7576,261 +7626,261 @@ msgstr ""
 "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Obchod selhal!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Smajlík selhal!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Sednutí selhalo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Selhalo vytváření postavy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Nemůžete vstoupit do party!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Nelze křičet!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Nedostatek bodů dovednosti (SP)!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Nemáte žádné zprávy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Toto momentálně nemůžete udělat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Potřebujete další rubín!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Potřebujete další safír!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Eh? Co to je?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Přesun selhal..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Neleze ukrást nic..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Jed nemá žádný účinek..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Síla %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Hbitost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalita %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Obratnost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Štěstí %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Detekován podvod s rychlostí."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Duplicitní přihlášení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Neznámá chyba připojení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Síla"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Hbitost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalita"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Inteligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Obratnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Štěstí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Obrana"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Magický útok"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Magická Obr."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Přesnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Uhnutí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritický zásah"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Zpoždění útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Zpoždění chůze"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Dosah útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Poškození za vteř."
 
@@ -7846,6 +7896,36 @@ msgstr "Obchod: Ty a %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s s tebou chce obchodovat, souhlasíš?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Síla:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Hbitost:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitalita:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Inteligence:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Obratnost:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Štěstí:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7886,85 +7966,85 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nepojmenovaný"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritický útok %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr "Magický útok %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritická obrana %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr "Magiská obrana %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "BM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Úroveň %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr "Rychlost %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr "Dosah %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr "Útěk %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
@@ -8319,6 +8399,48 @@ msgstr "%s zablokoval pozvání!"
 msgid "Char is not online!"
 msgstr "Postava není on-line!"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Ověření selhalo."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/de.po b/po/de.po
index b4a133bcf..f677e3cbb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -41,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -54,7 +54,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -62,123 +62,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d Wochen"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d Tage"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d Stunden"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d Minuten"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d Sekunden"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Ausgabe der Umgebungsvariablen"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -189,109 +189,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Name der Gruppe fehlt."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Name der Gilde fehlt."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "Freund"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "missachtet"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "Auf die schwarze Liste gesetzt"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "Feind"
 
@@ -306,77 +306,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -385,43 +385,43 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "Erfahrungspunkte"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -431,8 +431,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignoriere komplett"
 
@@ -459,37 +459,37 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -505,9 +505,9 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -515,32 +515,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
@@ -554,50 +554,50 @@ msgstr "Charakterserver wechseln"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
@@ -638,36 +638,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1047,7 +1047,7 @@ msgid "(F) free camera mode"
 msgstr "(F) freie Kamera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1056,7 +1056,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "Standard"
@@ -1218,8 +1218,8 @@ msgstr "Riesig (18)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(normal)"
 
@@ -1470,7 +1470,7 @@ msgstr "Kommentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
@@ -1493,28 +1493,28 @@ msgstr "Gruppe erstellen"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1522,7 +1522,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1530,7 +1530,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handeln"
@@ -1541,46 +1541,47 @@ msgstr "Handeln"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Angriff"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
@@ -1604,9 +1605,9 @@ msgstr "Atombombe"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Bewegen"
@@ -1615,7 +1616,7 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Sprechen"
@@ -1626,7 +1627,7 @@ msgstr "Sprechen"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1636,12 +1637,12 @@ msgstr "Kaufen"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1649,26 +1650,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Entferne aus Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Hinzufügen zur bevorzugten Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Hinzufügen zur normalen Angriffsliste"
 
@@ -1676,7 +1677,7 @@ msgstr "Hinzufügen zur normalen Angriffsliste"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
@@ -1684,44 +1685,44 @@ msgstr "Hinzufügen zur Ignorierenliste"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1731,20 +1732,20 @@ msgstr "Umbenennen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Warp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Bewege Kamera"
 
@@ -1753,7 +1754,7 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1761,69 +1762,69 @@ msgstr "Ausrüstung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Leere Ausrüstungsfenster"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Lösche den Namen nicht"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Lösche Name"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1833,79 +1834,79 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Name:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Alles zum Handel hinzufügen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -1914,64 +1915,64 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Alles ablegen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Alles aufnehmen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -1981,51 +1982,51 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Fächer des Wegwerffensters leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Verstecken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Zeigen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Nach oben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Nach unten"
 
@@ -2033,150 +2034,155 @@ msgstr "Nach unten"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Kaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Verkaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Lade zu Gruppe ein"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Zeige Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
@@ -2184,7 +2190,7 @@ msgstr "Alles fallenlassen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -2192,49 +2198,49 @@ msgstr "Wegwerfen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Aufteilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Rauswerfen"
 
@@ -2252,7 +2258,7 @@ msgstr "Tastenkürzel"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Fenster"
@@ -2280,10 +2286,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Sonstig"
 
@@ -2339,7 +2345,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monster"
 
@@ -2522,25 +2528,130 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "URL öffnen"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Beenden"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Max"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Preis: %s / Gesamt: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Ändern"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Typ:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Unbekannt."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "Surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Bot Unterstützung"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Art des Ziels:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Unbekannt."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3319,39 +3430,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Immer zeigen"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Automatisch ausblenden bei kleiner Auflösung"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Immer Automatisch ausblenden"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "System proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Direkte Verbindung"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3359,234 +3470,234 @@ msgstr "Niedrig"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "Mittel"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "Hoch"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Sonstiges"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Zeige zugefügten Schaden bei Monstern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Nur erreichbare Monster automatisch anvisieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Angriffsbereich vom Monstern anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "HP-Balken von Monster anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Durch die Angriffsziele wechseln"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Karte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Zeige Warp Partikel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Karten Ein- und Ausgänge hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Gegenstände auf dem Boden hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Angriffsbereich des Spielers hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Zeige erweiterte Minikarte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Zeige Pfad"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Zeige Hotkeys auf der Karte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Aktiviere träges Scrollen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Scrollträgheit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Scroll Radius"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Größe der Minimap automatisch anpassen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Bewegt sich"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Automatischen Berichtigen der Position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Während des Bewegens angreifen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Nächstes Ziel angreifen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synchronisiere Bewegungen des Spielers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Verrückte Bewegungen A-Programm"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Mausabhängige Bewegungen (gut für Touch Interfaces)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Eigenen HP-Balken anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Aktiviere schnelleres Aufwerten der Spielerattribute"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Angriffsziele des Spielers einkreisen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Zeige \"job exp\"-Nachrichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Zeige Spieler-Popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Abwesend Nachricht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Zeige Job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Aktiviere Angriffsfilter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Aufhebefilter aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Aktiviere angezeigtes Protokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Aktiviere Gewichtsbenachrichtigungen"
 
@@ -3594,173 +3705,179 @@ msgstr "Aktiviere Gewichtsbenachrichtigungen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Laden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Verkauf- und Kaufanfragen akzeptieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Durch NPCs blättern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Protokolliere NPC Dialoge"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Bot Unterstützung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Wiederholverzögerung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Wiederholungszeitraum"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "benutzerdefiniertes Wiederholungsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Kurzwahltasten"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Proxy Server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Proxy type"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy address:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktiviere Schutz bei fehlerhaften-Servern (nicht deaktivieren)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Ignoriere Eingabe 1"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "OpenGL-Log aktivieren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Aktiviere Eingabe-Protokoll"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Benutze FBO für Bildschirmfotos (nur für openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Netzwerkverzögerung zwischen Unterservern"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3992,7 +4109,7 @@ msgstr "Flüstern erlauben"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4683,7 +4800,7 @@ msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -4694,7 +4811,7 @@ msgstr "SOZ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Sozial"
 
@@ -4788,75 +4905,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preis: %s / Gesamt: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Menge:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Erstellen"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Beenden"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Max"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4878,19 +4939,19 @@ msgid "Type new email address twice:"
 msgstr "Gib die neue E-Mailadresse zweimal ein:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Die neue Emailaddresse muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Die neue Emailaddresse darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 
@@ -4908,7 +4969,7 @@ msgstr "Passwort ändern"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Passwort:"
@@ -4919,29 +4980,29 @@ msgid "Type new password twice:"
 msgstr "Gib dein neues Passwort zweimal ein:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Gib das alte Passwort zuerst an."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Das neue Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Das neue Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Die Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Neuer Charakter"
 
@@ -4949,9 +5010,9 @@ msgstr "Neuer Charakter"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Name :"
 
@@ -4959,11 +5020,11 @@ msgstr "Name :"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4972,72 +5033,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Frisur:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Männlich"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Weiblich"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -5066,7 +5127,7 @@ msgstr "Login wechseln"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Los!"
@@ -5074,36 +5135,36 @@ msgstr "Los!"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Abmelden"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5113,16 +5174,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
@@ -5187,7 +5248,7 @@ msgstr "Bearbeite Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Verbinde..."
 
@@ -5222,10 +5283,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Auswahl"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Auswahl"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5444,8 +5518,8 @@ msgstr "Wechsle den Server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrieren"
 
@@ -5561,7 +5635,7 @@ msgstr "Absenden"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5582,6 +5656,17 @@ msgstr "Senden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang, den Brief zu senden oder er war ungültig."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "Verkaufe Gegenstand"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5609,107 +5694,96 @@ msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-Mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Der Benutzername muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Der Benutzername darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Das Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Das Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "Verkaufe Gegenstand"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Warte auf den Server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -5757,160 +5831,160 @@ msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Erhöhen"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeiten Tab %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Gildenname"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -6111,7 +6185,7 @@ msgid "Completed"
 msgstr "Fertig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -6121,17 +6195,17 @@ msgid "Update"
 msgstr "Aktualisierung"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Wer ist Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -6153,25 +6227,25 @@ msgstr "Wähle Welt"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6179,7 +6253,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "U-Taste"
 
@@ -6255,71 +6329,77 @@ msgstr "Spieler anvisieren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Ziel Rasse:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Aufheben"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Ändere den Aufheben-Typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Wechsle Ansichtsmodus der Karte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "OK auswählen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Stoppen oder Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Zum sicheren Videomodus zurücksetzen"
 
@@ -6527,11 +6607,6 @@ msgid "Page down"
 msgstr "Seite runter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Auswahl"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Auswahl 2"
@@ -6876,6 +6951,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Ausrüstungstasten"
@@ -7253,95 +7333,65 @@ msgstr "  -T --Tests          : Beginne Treibertest und Autokonfiguration"
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Deaktiviert OpenGL für diese Sitzung"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Stärke:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Beweglichkeit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Gesundheit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Intelligenz:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Geschicklichkeit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Glück:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht verwenden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Unbekannter Charakterserver Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wurde der Name "
 "schon genommen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Falscher Name."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Falsche Stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Falsche Haare."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Falscher Slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Falsche Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Charakter gelöscht."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
@@ -7488,43 +7538,43 @@ msgstr "Das neue Passwort ist zu kurz."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Unbekannte ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Vom Server abgelehnt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du wurdest für immer gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Client zu alt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7534,22 +7584,22 @@ msgstr ""
 "Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Server ist voll."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Dieser Benutzername ist bereits in Verwendung."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Falsche E-Mail-Adresse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Benutzername für immer gelöscht."
 
@@ -7559,12 +7609,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Empty address given to Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen. "
 
@@ -7589,261 +7639,261 @@ msgstr ""
 "Du trägst weniger als die Hälfte des Gewichts. Du kannst dich regenerieren."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Handeln fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Gefühl fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Chat starten fehlgeschlagen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Konnte Gruppe nicht beitreten!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Du kannst nicht schreien!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du hast noch ein zu niedriges Level!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Unzureichende HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Unzureichende SP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Du hast keine Erinnerungen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Das kannst du im Moment nicht machen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Du brauchst ein weiteres rotes Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Du brauchst ein weiteres blaues Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Huh? Was ist das?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Gift hatte kein Effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Authentifizierung verweigert."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Stärke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Gesundheit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Geschicklichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Glück"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Angriffsverzögerung"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Lauf-Verzögerung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Angriffsreichweite"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
@@ -7859,6 +7909,36 @@ msgstr "Handeln: Du und %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Stärke:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Beweglichkeit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Gesundheit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Intelligenz:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Geschicklichkeit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Glück:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7899,85 +7979,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unbenannt"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -8336,6 +8416,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Authentifizierung verweigert."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/en_GB.po b/po/en_GB.po
index 6cf3b8fde..2e538f3a8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -4808,7 +4808,7 @@ msgstr "Create"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Exit"
 
@@ -5723,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
@@ -6219,66 +6219,71 @@ msgstr "Target Player"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Pick up"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Sit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "Select OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7802,7 +7807,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
diff --git a/po/eo.po b/po/eo.po
index cab8f0538..bb81bf2e4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -4808,7 +4808,7 @@ msgstr "Krei"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Eliri"
 
@@ -5723,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6219,66 +6219,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7802,7 +7807,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 96f13b389..39f212eb2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -52,123 +52,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d días"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "¡No se pueden enviar susurros vacíos!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -179,109 +179,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Falta el nombre del gremio."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Relación cambiada exitosamente! El jugador ahora es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "¡El jugador no fue ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "amigo"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "desatendido"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "en la lista negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "enemigo"
 
@@ -296,77 +296,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -421,8 +421,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -449,37 +449,37 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -495,9 +495,9 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -505,32 +505,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -544,50 +544,50 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -627,36 +627,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1036,7 +1036,7 @@ msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
@@ -1045,7 +1045,7 @@ msgstr "¿Quieres abrir la página de soporte?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "predeterminado"
@@ -1207,8 +1207,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1459,7 +1459,7 @@ msgstr "Comentario: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Crear grupo"
 
@@ -1482,28 +1482,28 @@ msgstr "Crear grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1511,7 +1511,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1519,7 +1519,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Intercambio"
@@ -1530,46 +1530,47 @@ msgstr "Intercambio"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
@@ -1593,9 +1594,9 @@ msgstr "Eliminar"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1604,7 +1605,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Hablar"
@@ -1615,7 +1616,7 @@ msgstr "Hablar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1625,12 +1626,12 @@ msgstr "Comprar"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Vender"
 
@@ -1638,26 +1639,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -1665,7 +1666,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1673,44 +1674,44 @@ msgstr "Agregar a la lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -1720,20 +1721,20 @@ msgstr "Renombrar"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Deformar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -1742,7 +1743,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1750,69 +1751,69 @@ msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1822,79 +1823,79 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -1903,64 +1904,64 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -1970,51 +1971,51 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Limpiar ventana de lanzamiento"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2022,150 +2023,155 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitación"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2173,7 +2179,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Tirar"
@@ -2181,49 +2187,49 @@ msgstr "Tirar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Expulsar"
 
@@ -2241,7 +2247,7 @@ msgstr "Atajos"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Ventanas"
@@ -2269,10 +2275,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Otro"
 
@@ -2328,7 +2334,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstruos"
 
@@ -2511,25 +2517,130 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "Abrir url"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Salir"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Máx"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Precio: %s / Total: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Editar"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipo:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Desconocido."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Soporte de bots"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Tipo de objetivo:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Desconocido."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3309,39 +3420,39 @@ msgid "No mods present"
 msgstr "No hay mods presentes"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Mostrar siempre"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Ocultar automáticamente en resoluciones pequeñas"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Auto-ocultar siempre"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Proxy del Sistema"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Conexión directa"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3349,234 +3460,234 @@ msgstr "bajo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "medio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Misceláneo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Resaltar el rango de ataque de los monstruos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de PV del monstruo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Mostrar partículas de portales"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Resaltar los los artículos el suelo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Resaltar el rango de ataque del jugador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Mostrar mini-mapas extendidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Habilitar desplazamiento perezoso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Pereza al desplazarse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Radio de desplazamiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Auto-redimensionar minimapas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Reproducir animaciones del mapa"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "En movimiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Corregir posición automáticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Mostrar posición del lado del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Atacar siguiente objetivo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Sincronizar movimiento del jugador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimientos relativos del ratón (bueno para interfaces táctiles)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Mostrar barra de PV propia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Apuntar cíclicamente los jugadores, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Mostrar mensajes de experiencia de trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Mensaje afk"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de recogido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Soporte para mascotas habilitado"
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Habilitar notificaciones de peso"
 
@@ -3584,176 +3695,182 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Tienda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra/venta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
 "cercano"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Registrar diálogos de NPCs"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Soporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Habilitar soporte para el bot 'AuctionBot'"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Retraso en repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Intervalo de repetición"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetición personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Atajos"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Tipo de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Dirección de proxy:puerto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "Ocultar enlace a página de soporte al ocurrir un error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Habilitar doble clics"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Habilitar inspector de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Nombre de ignorados"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Habilitar registro OpenGl"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Habilitar registro de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Directorio de capturas de pantalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Mostrar fondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Sobrescribir densidad de pantalla"
 
@@ -3989,7 +4106,7 @@ msgstr "Permitir mensajes privados"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4677,7 +4794,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4688,7 +4805,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Social"
 
@@ -4782,75 +4899,19 @@ msgid "Create items"
 msgstr "Crear artículos"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Precio: %s / Total: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Cantidad:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Crear"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Salir"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Máx"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4872,7 +4933,7 @@ msgid "Type new email address twice:"
 msgstr "Escribe el nuevo correo dos veces:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
@@ -4880,7 +4941,7 @@ msgstr ""
 "largitud."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
@@ -4888,7 +4949,7 @@ msgstr ""
 "longitud."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Las direcciones de correo suministradas no concuerdan."
 
@@ -4906,7 +4967,7 @@ msgstr "Cambiar contraseña"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Contraseña:"
@@ -4917,29 +4978,29 @@ msgid "Type new password twice:"
 msgstr "Escribe dos veces la nueva contraseña:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Primero ingresa la contraseña antigua."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "La nueva contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "La nueva contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Las contraseñas nuevas ingresadas no concuerdan."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Nuevo Personaje"
 
@@ -4947,9 +5008,9 @@ msgstr "Nuevo Personaje"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -4957,11 +5018,11 @@ msgstr "Nombre:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4970,72 +5031,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Peinado:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Masculino"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Femenino"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Raza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -5064,7 +5125,7 @@ msgstr "Volver al Login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jugar"
@@ -5072,36 +5133,36 @@ msgstr "Jugar"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Información"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Cambiar correo"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Cuenta %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5116,16 +5177,16 @@ msgstr ""
 "Experiencia: %u\n"
 "Dinero: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
@@ -5190,7 +5251,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5225,11 +5286,24 @@ msgid "Online list url:"
 msgstr "URL de lista de conectados:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Select"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Select"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5448,8 +5522,8 @@ msgstr "Cambiar de servidor"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrar"
 
@@ -5565,7 +5639,7 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5586,6 +5660,17 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "vender artículo"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "¿Realmente quieres vender %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5613,24 +5698,24 @@ msgid "Switch character"
 msgstr "Cambiar de personaje"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Correo:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 "El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
@@ -5638,84 +5723,73 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "La contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "vender artículo"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "¿Realmente quieres vender %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Usar la misma ip para los subservidores del juego"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descargando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "requiere una versión más nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -5763,159 +5837,159 @@ msgstr "Subasta"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando gremio llamado %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nombre del Gremio"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu gremio."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del gremio, pero ya existe uno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado a unirte al gremio %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al gremio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe uno."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Has sido invitado a unirte un grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear el grupo; ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
@@ -6116,7 +6190,7 @@ msgid "Completed"
 msgstr "Completado"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -6126,17 +6200,17 @@ msgid "Update"
 msgstr "Actualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Quién está conectado - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Quién está conectado - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Quién está conectado - Actualizar"
 
@@ -6158,25 +6232,25 @@ msgstr "Escoger Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6184,7 +6258,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "tecla desc."
 
@@ -6260,71 +6334,77 @@ msgstr "Apuntar a un Jugador"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Raza del objetivo:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Recoger"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sentarse"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Capturar pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar intercambios"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Abrir ventana de intercambio"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Cambiar el modo de vista del mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Detener o sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Volver a modo de video seguro"
 
@@ -6532,11 +6612,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Select"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Select2"
@@ -6881,6 +6956,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Teclas de vestimenta"
@@ -7257,94 +7337,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Fuerza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agilidad:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitalidad:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Inteligencia:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Destreza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Suerte:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
 "servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Imposible usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Falla char-server desconocida."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Estadísticas incorrectas."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Cabello incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Raza incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Apariencia incorrecta."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -7491,32 +7541,32 @@ msgstr "Nueva contraseña es muy corta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Error desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7524,12 +7574,12 @@ msgstr ""
 "equipo de GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7539,22 +7589,22 @@ msgstr ""
 "Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "E-mail incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
@@ -7564,12 +7614,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "¡Dirección vacía enviada a Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "No se puede resolver el host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada. "
 
@@ -7594,261 +7644,261 @@ msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "¡Fallo al intercambiar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "¡Fallo al hacer un emoticono!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "¡Fallo al sentarse!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "¡Fallo al crear un chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "¡No se puede unir al grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "¡Imposible gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "¡PV insuficientes!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "¡SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "¡No tienes ningún memo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "¡No puedes hacer esto ahora mismo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "¡Necesitas otra gema roja!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "¡Necesitas otra gema azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "¿Uh? ¿Qué es eso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Salto fallido..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "No puedes robar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Veneno no tuvo ningún efecto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Fuerza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencia %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Suerte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Fuerza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agilidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Inteligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Suerte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Retraso de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Retraso de Marcha"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Rango de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
@@ -7864,6 +7914,36 @@ msgstr "Intercambio: Tú y %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quiere realizar un intercambio contigo, ¿aceptas?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Fuerza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agilidad:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitalidad:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Inteligencia:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Suerte:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7904,85 +7984,85 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Nivel %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -8337,6 +8417,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Autenticación fallida."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/et.po b/po/et.po
index 0c65a85fc..a95a2178a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr ""
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6218,66 +6218,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 4e52083c9..fe37482bf 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr "بساز"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "خروج"
 
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6215,66 +6215,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7798,7 +7803,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index baede941f..fe586a31a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -42,123 +42,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d viikkoa"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d päivää"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d tuntia"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minuuttia"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d sekuntia"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -169,109 +169,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "ystävä"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "vaimennettu"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutraali"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "mustalistattu"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "vihollinen"
 
@@ -286,77 +286,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "-"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,43 +365,43 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -411,8 +411,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -439,37 +439,37 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -485,9 +485,9 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -495,32 +495,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -534,50 +534,50 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -617,36 +617,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1026,7 +1026,7 @@ msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1035,7 +1035,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "oletus"
@@ -1197,8 +1197,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1449,7 +1449,7 @@ msgstr "Kommentti: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
@@ -1472,28 +1472,28 @@ msgstr "Luo ryhmä"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1501,7 +1501,7 @@ msgid "Cancel"
 msgstr "Peru"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
@@ -1509,7 +1509,7 @@ msgstr "Paino: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tee kaupat"
@@ -1520,46 +1520,47 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Hyökkää"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
@@ -1583,9 +1584,9 @@ msgstr "Pommita"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Liiku"
@@ -1594,7 +1595,7 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Keskustele"
@@ -1605,7 +1606,7 @@ msgstr "Keskustele"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,12 +1616,12 @@ msgstr "Osta"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Myy"
 
@@ -1628,26 +1629,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1655,7 +1656,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1663,44 +1664,44 @@ msgstr "Lisää ohitettavien listaan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Karttaolio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1710,20 +1711,20 @@ msgstr "Nimeä uudelleen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1732,7 +1733,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1740,69 +1741,69 @@ msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1812,79 +1813,79 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -1893,64 +1894,64 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -1960,51 +1961,51 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2012,150 +2013,155 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Matki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2163,7 +2169,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Pudota"
@@ -2171,49 +2177,49 @@ msgstr "Pudota"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Jaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Potki"
 
@@ -2231,7 +2237,7 @@ msgstr "Pikavalinnat"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2259,10 +2265,10 @@ msgstr "Keskustelu"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Muu"
 
@@ -2318,7 +2324,7 @@ msgstr "NPCt"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Hirviöt"
 
@@ -2501,25 +2507,129 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Sulje"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Max"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Hinta: %s / Kaikkiaan: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Muokkaa"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tyyppi:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Tuntematon."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Bottien tuki"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Kohde"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Tuntematon."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3298,39 +3408,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3338,234 +3448,234 @@ msgstr "matala"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "keskitaso"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "korkea"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Sekal."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Kartta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Piirrä polku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Ota laiska vieritys käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Vierityksen laiskuus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Vierityksen säde"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Liikkuminen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Poissaoloviesti"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Näytä työ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Ota käyttöön mainosprotokolla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3573,173 +3683,179 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Kauppa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Bottien tuki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Jätä huomiotta syöte 1"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Näytä tausta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3971,7 +4087,7 @@ msgstr "Salli kuiskaukset"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4655,7 +4771,7 @@ msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Taidot"
 
@@ -4666,7 +4782,7 @@ msgstr "Sos"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Suhteet"
 
@@ -4760,75 +4876,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Hinta: %s / Kaikkiaan: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Määrä:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Luo"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Sulje"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Max"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4850,19 +4910,19 @@ msgid "Type new email address twice:"
 msgstr "Kirjoita uusi sähköpostiosoite kahdesti:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
@@ -4880,7 +4940,7 @@ msgstr "Vaihda salasana"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Salasana:"
@@ -4891,29 +4951,29 @@ msgid "Type new password twice:"
 msgstr "Kirjoita uusi salasana kahdesti:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Anna ensin vanha salasana."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Uuden salasanan kopiot eivät täsmää."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4921,9 +4981,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -4931,11 +4991,11 @@ msgstr "Nimi:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4944,72 +5004,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Miespuolinen"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Naispuolinen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Rotu:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -5038,7 +5098,7 @@ msgstr "Vaihda sisäänkirjautumistietoja"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Pelaa"
@@ -5046,36 +5106,36 @@ msgstr "Pelaa"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Tietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5085,16 +5145,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Salasana:"
 
@@ -5159,7 +5219,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -5194,10 +5254,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Valitse OK"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5416,8 +5489,8 @@ msgstr "Vaihda palvelinta"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -5533,7 +5606,7 @@ msgstr "Lähetä"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5554,6 +5627,17 @@ msgstr "Lähetä"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5581,107 +5665,96 @@ msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Vahvista:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -5729,159 +5802,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Killan nimi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -6080,7 +6153,7 @@ msgid "Completed"
 msgstr "Valmis"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -6090,17 +6163,17 @@ msgid "Update"
 msgstr "Päivitä"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -6122,25 +6195,25 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6148,7 +6221,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6224,71 +6297,77 @@ msgstr "Pelaaja kohteeksi"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Kohteen ryhmä:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Poimi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Muuta poiminnan tyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Istu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Valitse OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6496,11 +6575,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6845,6 +6919,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7219,92 +7298,62 @@ msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Voima:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Ketteryys:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Elinvoima:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Älykkyys:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Näppäryys:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Tuuri:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Tätä tunnistetta ei voi käyttää."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Tuntematon hahmopalvelinvirhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Väärät arvot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Väärä hiustyyli."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Väärä rotu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -7451,44 +7500,44 @@ msgstr "Uusi salasana on liian lyhyt."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7498,22 +7547,22 @@ msgstr ""
 "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
@@ -7523,12 +7572,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Osoitetta ei löydy: \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
@@ -7550,261 +7599,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Elehtiminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Keskustelun luonti epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Ryhmään liittyminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Huutaminen epäonnistui!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Siis mikä?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Siirtymä (warp) epäonnistui..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Varastaminen ei onnistunut..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Voima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Ketteryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Elinvoima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Älykkyys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Näppäryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Tuuri"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
@@ -7820,6 +7869,36 @@ msgstr "Kauppa: sinä ja %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Voima:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Ketteryys:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Elinvoima:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Älykkyys:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Näppäryys:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Tuuri:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7860,85 +7939,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -8294,6 +8373,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Tunnistus epäonnistui."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 4f2e4867e..47123335b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-19 09:07+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -44,7 +44,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -52,123 +52,123 @@ msgstr "Fichier mis en ligne"
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d semaines"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d semaines"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d jours"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d jours"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d heures"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d heures"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minutes"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d secondes"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages privés vides !"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -179,110 +179,110 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "La touche <Entrée> ferme la ligne d'entrée de la conversation."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur %s avec succès !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu arrêter d'ignorer ce joueur !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr "Joueur plus maintenant effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Le joueur n'a pas pu être effacé !"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "ami"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "écarté"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutre"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "sous liste noire"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "ennemi"
 
@@ -297,77 +297,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Humain"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Vous avez été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "L'inventaire est plein."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "La pile est trop grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -422,8 +422,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -450,37 +450,37 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -496,9 +496,9 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -506,32 +506,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -545,50 +545,50 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -629,37 +629,37 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1039,7 +1039,7 @@ msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
@@ -1048,7 +1048,7 @@ msgstr "Veux-tu ouvrir la page d'aide ?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "défaut"
@@ -1210,8 +1210,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1462,7 +1462,7 @@ msgstr "Commentaire : %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Créer un groupe"
 
@@ -1485,28 +1485,28 @@ msgstr "Créer un groupe"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1514,7 +1514,7 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
@@ -1522,7 +1522,7 @@ msgstr "Poids : %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Échange"
@@ -1533,46 +1533,47 @@ msgstr "Échange"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Attaquer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
@@ -1596,9 +1597,9 @@ msgstr "Annihiler"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Déplacement"
@@ -1607,7 +1608,7 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parler"
@@ -1618,7 +1619,7 @@ msgstr "Parler"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1628,12 +1629,12 @@ msgstr "Acheter"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1641,26 +1642,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -1668,7 +1669,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -1676,44 +1677,44 @@ msgstr "Ajouter à la liste d'ignorés"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Objet de carte"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1723,20 +1724,20 @@ msgstr "Renommer"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -1745,7 +1746,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1753,69 +1754,69 @@ msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1825,79 +1826,79 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nom :                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -1906,64 +1907,64 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -1973,51 +1974,51 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2025,150 +2026,155 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Jeter..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Jeter tout"
 
@@ -2176,7 +2182,7 @@ msgstr "Jeter tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Jeter"
@@ -2184,49 +2190,49 @@ msgstr "Jeter"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Partager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Virer"
 
@@ -2244,7 +2250,7 @@ msgstr "Raccourcis"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Fenêtres"
@@ -2272,10 +2278,10 @@ msgstr "Conversation"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Autre"
 
@@ -2331,7 +2337,7 @@ msgstr "PNJs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstres"
 
@@ -2514,28 +2520,133 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "Ouvrir l'adresse"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Quitter"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Max."
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Prix : %s / Total : %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Éditer"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
-#, c-format
-msgid "Mana: -%d"
-msgstr ""
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Type :"
 
+#. TRANSLATORS: Skill type
 #: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Inconnu."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Support des bots"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Type de cible :"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Inconnu."
+
+#: src/gui/widgets/skillinfo.cpp:147
+#, fuzzy, c-format
+msgid " / Mana: -%d"
+msgstr "Mana : -%d"
+
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
-msgstr ""
+msgstr "Portée : %d"
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -3313,39 +3424,39 @@ msgid "No mods present"
 msgstr "Pas de mods présent"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Toujours montrer"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Cacher automatiquement en basse résolution"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Toujours cacher automatiquement"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Système proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Connexion directe"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "Nom d'hôte SOCKS5"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3353,234 +3464,234 @@ msgstr "bas"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "moyen"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "élevés"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Divers"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Sélectionner les monstres par ordre de distance"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les objets sur le sol"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Afficher les mini-cartes avancées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Activer le défilement paresseux"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Paresse de défilement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Rayon de défilement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Redimensionnement automatique des mini-cartes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Jouer les animations de la carte"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "En mouvement"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Afficher la position du côté du serveur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Attaquer la prochaine cible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Programme de mouvement de fou A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Mouvements relatifs à la souris (bon pour les interfaces tactiles)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Afficher ta propre barre de vie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Sélectionner les joueurs par ordre de distance"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Message d'absence"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Afficher les compétences"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Activer le filtre de ramassage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Possibilité des familiers activée"
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Activer les notifications de poids"
 
@@ -3588,174 +3699,180 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Boutique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat / de vente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Boucler les cibles PNJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Support des bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Activer support pour le Bot aux Enchères"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Clavier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Délai de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Intervalle de répétition"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Intervalle de répétition personnalisé"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Type de proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "Cacher le lien de la page d'aide quand erreur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Activer double-cliques"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activer la protection pour serveurs defaillant (ne pas désactiver)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Noms ignorés"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Activer historique OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Activer l'historique d'entrées"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr "Mettre en ligne le fichier d'historique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Répertoire des captures d'écran"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Retard du réseau entre les sous-serveurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Montrer le fond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Écrasement de la densité de l'écran"
 
@@ -3995,7 +4112,7 @@ msgstr "Autoriser les messages privés"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4686,7 +4803,7 @@ msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Compétences"
 
@@ -4697,7 +4814,7 @@ msgstr "Soc"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Social"
 
@@ -4791,75 +4908,19 @@ msgid "Create items"
 msgstr "Créer des objets"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prix : %s / Total : %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Montant :"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Créer"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Quitter"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Max."
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4881,19 +4942,19 @@ msgid "Type new email address twice:"
 msgstr "Entrer l'adresse e-mail deux fois :"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "La nouvelle adresse email doit être longue d'au moins %u caractères."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "La nouvelle adresse email doit être longue d'au plus %u caractères."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Les deux adresses e-mail ne correspondent pas."
 
@@ -4911,7 +4972,7 @@ msgstr "Changer le mot de passe"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -4922,29 +4983,29 @@ msgid "Type new password twice:"
 msgstr "Entrer le mot de passe deux fois :"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Entre d'abord l'ancien mot de passe."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Le nouveau mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Le nouveau mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Nouveau Personnage"
 
@@ -4952,9 +5013,9 @@ msgstr "Nouveau Personnage"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nom :"
 
@@ -4962,11 +5023,11 @@ msgstr "Nom :"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4975,72 +5036,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Couleur :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Coupe :"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Masculin"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Féminin"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -5069,7 +5130,7 @@ msgstr "Changer de compte"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jouer"
@@ -5077,36 +5138,36 @@ msgstr "Jouer"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Informations"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Se désinscrire"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
-msgstr ""
+msgstr "Définis le nouveau code pin"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5121,16 +5182,16 @@ msgstr ""
 "Expérience : %u\n"
 "Argent : %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Entre le mot de passe pour effacer le personnage"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
@@ -5195,7 +5256,7 @@ msgstr "Éditer le Serveur"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -5230,10 +5291,23 @@ msgid "Online list url:"
 msgstr "URL de la liste en ligne :"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entre au moins l'adresse et le port du serveur."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Sélectionner"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Sélectionner"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5452,8 +5526,8 @@ msgstr "Changer de Serveur"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -5569,7 +5643,7 @@ msgstr "Soumettre"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5590,6 +5664,17 @@ msgstr "Envoyer"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "vendre objet"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Veux-tu vraiment vendre %s ?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5617,107 +5702,96 @@ msgid "Switch character"
 msgstr "Changer de personnage"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Vérification :"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-mail :"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr " Le mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr " Le mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "vendre objet"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Veux-tu vraiment vendre %s ?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -5765,163 +5839,163 @@ msgstr "Enchères"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Choisis le nom de la guilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Tu as été invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'a invité à rejoindre son groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
@@ -6122,7 +6196,7 @@ msgid "Completed"
 msgstr "Terminé"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -6132,17 +6206,17 @@ msgid "Update"
 msgstr "Mise à jour"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -6164,25 +6238,25 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6190,7 +6264,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "touche u"
 
@@ -6266,71 +6340,77 @@ msgstr "Viser le Joueur"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Catch pet"
-msgstr ""
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Race de la cible :"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Catch pet"
+msgstr "Attraper familier"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Autres touches"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Ramasser"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "S'asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Ouvrir la fenêtre d'échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr "Commencer l'échange avec la cible"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr "Suivre le joueur sélectionné"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "S'arrêter et s’asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Revenir au mode vidéo sécurisé"
 
@@ -6422,7 +6502,7 @@ msgstr "Touche du modificateur d'émoticône"
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
 msgid "Pet emote modifier key"
-msgstr ""
+msgstr "Touche de modification d'émoticône du familier"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6461,7 +6541,7 @@ msgstr "Raccourci d'émoticône %d"
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
 msgid "Pet emote shortcuts"
-msgstr ""
+msgstr "Raccourcis d'émoticône du familier"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6490,7 +6570,7 @@ msgstr ""
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
 #, c-format
 msgid "Pet emote shortcut %d"
-msgstr ""
+msgstr "Raccourci d'émoticône du familier %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -6538,11 +6618,6 @@ msgid "Page down"
 msgstr "Page suivante"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Sélectionner"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Sélectionner2"
@@ -6887,6 +6962,11 @@ msgid "Upload server config"
 msgstr "Mettre en ligne la config du serveur"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Touches des tenues"
@@ -7267,94 +7347,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Force :"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agilité :"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitalité :"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Intelligence :"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Dextérité :"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Chance :"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Tu ne peux pas utiliser cette identification."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Erreur inconnue du serveur de personnage."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Stats incorrectes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Cheveux incorrects."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Race incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Apparence incorrecte."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -7374,6 +7424,8 @@ msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 #: src/net/ea/chathandler.cpp:129
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
+"Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les "
+"joueurs."
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7501,32 +7553,32 @@ msgstr "Le nouveau mot de passe est trop court."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7534,12 +7586,12 @@ msgstr ""
 "MJs."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Client trop ancien."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7549,22 +7601,22 @@ msgstr ""
 "Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Mail incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
@@ -7574,12 +7626,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Impossible de connecter au serveur \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée. "
 
@@ -7605,261 +7657,261 @@ msgstr ""
 "pouvez maintenant récupérer ta santé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Échec de la transaction !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Émoticône non réalisée !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous asseoir !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP insuffisants !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Vous n'avez pas d'aide-mémoire !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez pas faire ça maintenant !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire ça !"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Le poison n'a pas eu d'effet..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Force %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Agilité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dextérité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Chance %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Force"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agilité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Dextérité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Chance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Défense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Attaque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Défense M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Dégâts par s."
 
@@ -7875,6 +7927,36 @@ msgstr "Échange : Toi et %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Force :"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agilité :"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitalité :"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Intelligence :"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Dextérité :"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Chance :"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7915,85 +7997,85 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr "Attaque critique %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr "Attaque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr "Défense critique %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr "Défense M. %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Niveau %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr "Vitesse %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr "Portée %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr "Fuir %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -8336,17 +8418,59 @@ msgstr "pvp inconnu"
 #: src/resources/notifications.h:315
 #, c-format
 msgid "Char from account %s is already in your party!"
-msgstr ""
+msgstr "Perso du compte %s est déjà dans ton groupe !"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:319
 #, c-format
 msgid "%s blocked invite!"
-msgstr ""
+msgstr "%s a bloqué l'invitation !"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:323
 msgid "Char is not online!"
+msgstr "Perso n'est pas en ligne !"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Échec de l'authentification."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
diff --git a/po/he.po b/po/he.po
index 769c3c047..cc99e5603 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr "צור"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "יציאה"
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
@@ -6218,66 +6218,71 @@ msgstr "כוון לשחקן"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "הרם"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "שב"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "בחר אישור"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
diff --git a/po/hr.po b/po/hr.po
index 69aa7fa9b..ea7f28b9a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -4808,7 +4808,7 @@ msgstr "Stvori"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -5725,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
@@ -6221,66 +6221,71 @@ msgstr "Ciljaj Igrača"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Pokupi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Sjedni"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "Odaberite OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7804,7 +7809,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
diff --git a/po/hu.po b/po/hu.po
index 66342ff70..28a852d2e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr "Létrehozás"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
@@ -6218,66 +6218,71 @@ msgstr "Játékost Kijelöl"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Felvesz"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Ülés"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
diff --git a/po/id.po b/po/id.po
index 4a4edc3f1..1c07c9234 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -45,123 +45,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -172,109 +172,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "Teman"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "Diabaikan"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "netral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr ""
 
@@ -289,77 +289,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "item terlalu berat."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "barang terlalu jauh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr ""
 
@@ -441,37 +441,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -487,9 +487,9 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -497,32 +497,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
@@ -536,50 +536,50 @@ msgstr "Pergantian server"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Ubah sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -619,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1028,7 +1028,7 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1037,7 +1037,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "kembalikan ke semula"
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1451,7 +1451,7 @@ msgstr "Komentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr ""
 
@@ -1474,28 +1474,28 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1503,7 +1503,7 @@ msgid "Cancel"
 msgstr "Batal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
@@ -1511,7 +1511,7 @@ msgstr "Berat: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tukar"
@@ -1522,46 +1522,47 @@ msgstr "Tukar"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Pukul"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Berbisik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
@@ -1585,9 +1586,9 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jalan"
@@ -1596,7 +1597,7 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Berbicara"
@@ -1607,7 +1608,7 @@ msgstr "Berbicara"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1617,12 +1618,12 @@ msgstr "Beli"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Jual"
 
@@ -1630,26 +1631,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
@@ -1657,7 +1658,7 @@ msgstr "Tambahkan ke daftar menyerang"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
@@ -1665,44 +1666,44 @@ msgstr "Tambahkan ke daftar Abaikan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Daftar barang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Ganti nama"
 
@@ -1712,20 +1713,20 @@ msgstr "Ganti nama"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1734,7 +1735,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1743,69 @@ msgstr "Setelan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1814,79 +1815,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nama:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
@@ -1895,64 +1896,64 @@ msgstr "Tambahkan semua ke Penukaran"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Masukkan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Masukkan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Masukkan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Kembalikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -1962,51 +1963,51 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Sembunyikan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Tampilkan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2014,150 +2015,155 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Jadikan teman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Mengikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Tirukan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Buang semuanya"
 
@@ -2165,7 +2171,7 @@ msgstr "Buang semuanya"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Buang"
@@ -2173,49 +2179,49 @@ msgstr "Buang"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Pecah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "keluarkan"
 
@@ -2233,7 +2239,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2261,10 +2267,10 @@ msgstr "Obrolan"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Lainnya"
 
@@ -2320,7 +2326,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
@@ -2503,25 +2509,128 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Keluar"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Max"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Harga: %s/ Total: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Ganti"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipe:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Tidak diketahui."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Target"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Tidak diketahui."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3298,39 +3407,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3338,234 +3447,234 @@ msgstr "rendah"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "sedang"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "tinggi"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "macam-macam"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Peta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Bergerak"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3573,173 +3682,178 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Toko"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+msgid "Ignore logging packets"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3971,7 +4085,7 @@ msgstr "Perbolehkan berbisik"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4654,7 +4768,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -4665,7 +4779,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr ""
 
@@ -4759,75 +4873,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Harga: %s/ Total: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Buat"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Keluar"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Max"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4849,19 +4907,19 @@ msgid "Type new email address twice:"
 msgstr "Tulis alamat email yang baru dua kali:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Pengisian alamat email tidak cocok."
 
@@ -4879,7 +4937,7 @@ msgstr "Ganti sandi"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Kata Sandi:"
@@ -4890,29 +4948,29 @@ msgid "Type new password twice:"
 msgstr "ketik sandi baru dua kali:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Masukkan sandi lama dahulu."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Password baru yang dimasukkan tidak cocok."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4920,9 +4978,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nama:"
 
@@ -4930,11 +4988,11 @@ msgstr "Nama:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4943,72 +5001,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Warna rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Gaya rambut:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Laki-laki"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Perempuan"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -5037,7 +5095,7 @@ msgstr "Ubah Login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Main"
@@ -5045,36 +5103,36 @@ msgstr "Main"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Tidak jadi mendaftar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Ganti email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5084,16 +5142,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
@@ -5158,7 +5216,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -5193,10 +5251,22 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+msgid "Select egg"
+msgstr ""
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5413,8 +5483,8 @@ msgstr "Menganti Server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Mendaftar"
 
@@ -5530,7 +5600,7 @@ msgstr "Masukan"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5551,6 +5621,17 @@ msgstr "Kirim"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5578,107 +5659,96 @@ msgid "Switch character"
 msgstr "Ganti Karakter"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -5726,159 +5796,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6077,7 +6147,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6087,17 +6157,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6119,25 +6189,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6145,7 +6215,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6221,71 +6291,77 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Target Kelompok:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6493,11 +6569,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6842,6 +6913,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7215,92 +7291,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Kekuatan:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Daya/Tenaga Hidup:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Kecerdasan:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Ketangkasan:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr ""
 
@@ -7447,43 +7493,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7491,22 +7537,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
@@ -7516,12 +7562,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -7545,261 +7591,261 @@ msgstr ""
 "beregenerasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr ""
 
@@ -7815,6 +7861,36 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Kekuatan:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Daya/Tenaga Hidup:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Kecerdasan:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Ketangkasan:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7855,85 +7931,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr ""
 
@@ -8288,6 +8364,47 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+msgid "Pet catch failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/it.po b/po/it.po
index 00c662f87..b1629b7da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -42,7 +42,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -50,123 +50,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d settimane"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d giorni"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d ore"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minuti"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d secondi"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -177,109 +177,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "Amico"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "Disprezzato"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "Neutrale"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "nella lista nera"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "nemico"
 
@@ -294,77 +294,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Umano"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sei stato ucciso da %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "L'inventario è pieno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -373,43 +373,43 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -419,8 +419,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -447,37 +447,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -493,9 +493,9 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -503,32 +503,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -542,50 +542,50 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -625,36 +625,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1034,7 +1034,7 @@ msgid "(F) free camera mode"
 msgstr "(F) Modalita' camera libera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1043,7 +1043,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "Predefinito"
@@ -1205,8 +1205,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(default)"
 
@@ -1457,7 +1457,7 @@ msgstr "Commento: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Crea gruppo"
 
@@ -1480,28 +1480,28 @@ msgstr "Crea gruppo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1509,7 +1509,7 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1517,7 +1517,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Commercia"
@@ -1528,46 +1528,47 @@ msgstr "Commercia"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
@@ -1591,9 +1592,9 @@ msgstr "Nascondi"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Movimento"
@@ -1602,7 +1603,7 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parla"
@@ -1613,7 +1614,7 @@ msgstr "Parla"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1623,12 +1624,12 @@ msgstr "Compra"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1636,26 +1637,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Rimuovi dalla lista Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Aggiungi alla lista Attacco - Priorità"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1663,7 +1664,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1671,44 +1672,44 @@ msgstr "Aggiungi alla lista Ignora"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -1718,20 +1719,20 @@ msgstr "Rinomina"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -1740,7 +1741,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1748,69 +1749,69 @@ msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Lascia"
 
@@ -1820,79 +1821,79 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -1901,64 +1902,64 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -1968,51 +1969,51 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2020,150 +2021,155 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Invita nel party"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2171,7 +2177,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Lascia"
@@ -2179,49 +2185,49 @@ msgstr "Lascia"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Caccia"
 
@@ -2239,7 +2245,7 @@ msgstr "Shortcuts"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Finestre"
@@ -2267,10 +2273,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Altro"
 
@@ -2326,7 +2332,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Mostri"
 
@@ -2509,25 +2515,129 @@ msgstr ""
 msgid "Open url"
 msgstr "Apri url"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Esci"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Massimo"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Prezzo: %s / Totale: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Modifica"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Type:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Sconosciuto."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Razza target:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Sconosciuto."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3306,39 +3416,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Mostra sempre"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Nascondi sempre"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Sistema Proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Connessione diretta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3346,234 +3456,234 @@ msgstr "Basso"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "medio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "Alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Varie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Mostra danno afflitto ai nemici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Target automatico solo sui nemici raggiungibili"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Evidenzia distanza massima di attacco del nemico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Mostra la barra HP dei nemici"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Ciclo di target sui nemici"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Mostra le particelle per le transizioni di mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Evidenzia i cambiamenti di mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Evidenzia oggetti sul terreno"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Evidenzia distanza massima d'attacco"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Mostra minimap estesa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Traccia sentiero"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Mostra hotkeys sulla mappa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Adatta automaticamente le minimappe"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Correggi posizione automaticamente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Attacca in movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Attacca Target successivo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Sincronizza movimenti giocatore"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Movimento matto \"A\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Giocatore"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Mostra la barra HP giocatore"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Abilita statistiche veloci"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Ciclo di target sui giocatori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Visualizza messaggi popup"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Mostra barra lavoro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Attiva filtro attacchi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Attiva filtro 'Raccogli'"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3581,173 +3691,179 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Negozio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Accetta richieste di vendita/acquisto"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Server Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Tipologia Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy indirizzo:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Attiva attacchi server-side"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Ignora input 1"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Attiva registro attivita' OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Mostra sfondo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3979,7 +4095,7 @@ msgstr "Permetti sussurri"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4668,7 +4784,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Abilità"
 
@@ -4679,7 +4795,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Sociale"
 
@@ -4773,75 +4889,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prezzo: %s / Totale: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Quantita':"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Crea"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Esci"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Massimo"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4863,19 +4923,19 @@ msgid "Type new email address twice:"
 msgstr "Scrivi due volte il nuovo indirizzo email:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Gli indirizzi email immessi non coincidono."
 
@@ -4893,7 +4953,7 @@ msgstr "Cambia la Password"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Password:"
@@ -4904,29 +4964,29 @@ msgid "Type new password twice:"
 msgstr "Digita due volte la nuova password:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Inserisci prima la nuova password."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Le password immesse non coincidono."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Nuovo Personaggio"
 
@@ -4934,9 +4994,9 @@ msgstr "Nuovo Personaggio"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nome:"
 
@@ -4944,11 +5004,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4957,72 +5017,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Maschio"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Femmina"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -5051,7 +5111,7 @@ msgstr "Cambia login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Gioca"
@@ -5059,36 +5119,36 @@ msgstr "Gioca"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Informazioni"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Cambia email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5098,16 +5158,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Digitare password:"
 
@@ -5172,7 +5232,7 @@ msgstr "Modifica Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Connetti"
 
@@ -5207,10 +5267,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Seleziona"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Seleziona"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5429,8 +5502,8 @@ msgstr "Cambia server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registra"
 
@@ -5546,7 +5619,7 @@ msgstr "Invia"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5567,6 +5640,17 @@ msgstr "Invia"
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5594,107 +5678,96 @@ msgid "Switch character"
 msgstr "Cambia personaggio"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Conferma:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -5742,159 +5815,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party."
 
@@ -6095,7 +6168,7 @@ msgid "Completed"
 msgstr "Completato"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
@@ -6105,17 +6178,17 @@ msgid "Update"
 msgstr "Aggiornamento"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Chi è online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -6137,25 +6210,25 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6163,7 +6236,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6239,71 +6312,77 @@ msgstr "Punta Giocatore"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Razza target:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Raccogli"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Cambia modo di raccogliere"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Cambia visualiz. mappa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Seleziona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Fermati o siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Ritorna alla modalità video sicura"
 
@@ -6511,11 +6590,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Seleziona"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6860,6 +6934,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7236,92 +7315,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Forza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agilità:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Costituzione:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Intelligenza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Destrezza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Fortuna:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accesso negato. Probabilmente il server è sovraccarico."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "ID non disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Errore char-server sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Creazione personaggio non riuscita. Il nome è già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Nome errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Statistiche errate."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Taglio capelli errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Slot errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Razza errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personaggio eliminato."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
@@ -7468,32 +7517,32 @@ msgstr "La nuova password è troppo corta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "ID non registrato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Password errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Account scaduto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Rifiutato dal server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7501,12 +7550,12 @@ msgstr ""
 "per maggiori informazioni."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Versione del Client obsoleta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7516,22 +7565,22 @@ msgstr ""
 "Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Server affollato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Username già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Email errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Username cancellato permanentemente."
 
@@ -7541,12 +7590,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Impossibile contattare l'host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Connessione al server terminata. "
 
@@ -7571,261 +7620,261 @@ msgstr ""
 "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Scambio non riuscito!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Emote fallito!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Non puoi sederti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Creazione Chat fallita!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Non puoi aggiungerti al Party!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Non puoi urlare!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un Livello sufficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP Insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Non hai nessun promemoria!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Al momento non puoi farlo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa Abilità con questa arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Hai bisogno un'altra Gemma Rossa!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Hai bisogno un'altra Gemma Blu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Stai trasportando troppo carico per compiere quest'azione!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Huh? Cos'è?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Teletrasporto fallito..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Non riesci a rubare niente..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Il veleno non ha effetto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Accesso duplicato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Forza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agilità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Fortuna"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Difesa."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Attacco magico."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Difesa Magica."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasione"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Colpo critico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Ritardo Attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Ritardo Movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Range d'attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Danno per secondo."
 
@@ -7841,6 +7890,36 @@ msgstr "Scambio con %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vuole commerciare con te, accetti?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Forza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agilità:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Costituzione:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Intelligenza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Destrezza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Fortuna:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7881,85 +7960,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -8314,6 +8393,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Autenticazione fallita."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index da6bd4cc8..65f13de67 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -39,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -47,123 +47,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d週"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d日"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d時"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d分"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "空のささやきを送信することはできません!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,109 +174,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "パーティ名がありません."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "ギルド名がありません."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーを完全無視できませんでした!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "プレイヤーを完全無視解除しました!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "プレイヤーを完全無視解除できませんでした!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "友達"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "無視"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "中性"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "敵"
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "人間"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -369,43 +369,43 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -443,37 +443,37 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -489,9 +489,9 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -499,32 +499,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -538,50 +538,50 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -621,36 +621,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1030,7 +1030,7 @@ msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1039,7 +1039,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "デフォルト"
@@ -1201,8 +1201,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1453,7 +1453,7 @@ msgstr "コメント: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "パーティを作る"
 
@@ -1476,28 +1476,28 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1505,7 +1505,7 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1513,7 +1513,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "トレード"
@@ -1524,46 +1524,47 @@ msgstr "トレード"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
@@ -1587,9 +1588,9 @@ msgstr "消す"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "動く"
@@ -1598,7 +1599,7 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "話す"
@@ -1609,7 +1610,7 @@ msgstr "話す"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1619,12 +1620,12 @@ msgstr "買う"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "売る"
 
@@ -1632,26 +1633,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1659,7 +1660,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1667,44 +1668,44 @@ msgstr "攻撃無視リストへ追加する"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "マップアイテム"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1714,20 +1715,20 @@ msgstr "名前を変更する"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -1736,7 +1737,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1744,69 +1745,69 @@ msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "退会"
 
@@ -1816,79 +1817,79 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -1897,64 +1898,64 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -1964,51 +1965,51 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2016,150 +2017,155 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "真似"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2167,7 +2173,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "落とす"
@@ -2175,49 +2181,49 @@ msgstr "落とす"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "追い出す"
 
@@ -2235,7 +2241,7 @@ msgstr "ショートカット"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "ウィンドウ"
@@ -2263,10 +2269,10 @@ msgstr "チャット"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "その他"
 
@@ -2322,7 +2328,7 @@ msgstr "NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "モンスター"
 
@@ -2505,25 +2511,130 @@ msgstr "装着."
 msgid "Open url"
 msgstr "URLを開く"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "終了"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "最大"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "価格:%s /合計:%s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "編集"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "タイプ:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "不明."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "サラウンド"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "ボットサポート"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "ターゲット種別:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "不明."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3302,39 +3413,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "常に表示"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "細かい解像度で隠す"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "常に自動で隠す"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "システムプロキシ"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "直接接続"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 ホスト名"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3342,234 +3453,234 @@ msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "その他"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えたダメージを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "攻撃可能範囲のモンスターのみ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "モンスターの攻撃範囲を強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "モンスターのHPバーを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "選択したモンスターを円で表示"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "マップ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "ワープパーティクルを表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "マップポータルを強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "床に落ちているアイテムを強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "攻撃可能範囲を強調表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "拡張ミニマップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "パスを表示させる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "マップにホットキーを表示させる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "レイジースクロールを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "レイジースクロール"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "ラディアススクロール"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "動作"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "自動で位置を修正"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "移動中も攻撃する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "プレイヤーの動きを同化する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "クレイジームーブ A プログラム"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "プレイヤー"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "クイックスタッツを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "選択したプレイヤーを円で表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "ジョブExpメッセージを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "プレイヤーポップアップを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "AFKメッセージ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "ジョブを表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "攻撃フィルターを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "アドバートプロトコルを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3577,173 +3688,179 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "売買リクエストを受け入れる"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "NPCターゲットを回転"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録する"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "ボットサポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "ショートカットボタン"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "プロキシサーバー"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "プロキシタイプ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "プロキシアドレス:ポート"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "インプット１完全無視"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "OpenGLログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "入力ログを有効にする"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠す"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "背景を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3975,7 +4092,7 @@ msgstr "全てのささやきを受け取る"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4658,7 +4775,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "スキル"
 
@@ -4669,7 +4786,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "ソーシャル"
 
@@ -4763,75 +4880,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "価格:%s /合計:%s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "量:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "作成"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "終了"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "最大"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4853,19 +4914,19 @@ msgid "Type new email address twice:"
 msgstr "新しいメールアドレスを二回入力してください:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "メールアドレスが一致しません."
 
@@ -4883,7 +4944,7 @@ msgstr "パスワードの変更"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "パスワード:"
@@ -4894,29 +4955,29 @@ msgid "Type new password twice:"
 msgstr "新しいパスワードを二回入力してください:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "元のパスワードを入力してください."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "新しいキャラクター"
 
@@ -4924,9 +4985,9 @@ msgstr "新しいキャラクター"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "名前:"
 
@@ -4934,11 +4995,11 @@ msgstr "名前:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4947,72 +5008,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "髪色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "ヘアスタイル:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "男性"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "女性"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -5041,7 +5102,7 @@ msgstr "別アカウントでログイン"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "プレイ"
@@ -5049,36 +5110,36 @@ msgstr "プレイ"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "情報"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "登録解除"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5088,16 +5149,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
@@ -5162,7 +5223,7 @@ msgstr "サーバー編集"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "接続"
 
@@ -5197,10 +5258,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "選択"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "選択"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5417,8 +5491,8 @@ msgstr "サーバー変更"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "登録"
 
@@ -5534,7 +5608,7 @@ msgstr "決定"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5555,6 +5629,17 @@ msgstr "送信する"
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5582,107 +5667,96 @@ msgid "Switch character"
 msgstr "キャラクターを変更する"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Eメール:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "ダウンロード準備中"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -5730,159 +5804,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "ギルド名"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください."
 
@@ -6083,7 +6157,7 @@ msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
@@ -6093,17 +6167,17 @@ msgid "Update"
 msgstr "アップデート"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -6125,25 +6199,25 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6151,7 +6225,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "u キー"
 
@@ -6227,71 +6301,77 @@ msgstr "プレイヤーをターゲット"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "ターゲット種別:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "その他のキー"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "拾う"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "拾い方を変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "取引を有効/無効にする"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "マップビューモード変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "OKを選択する"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "止まる・座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "セーフビデオモードへ戻る"
 
@@ -6499,11 +6579,6 @@ msgid "Page down"
 msgstr "ページ下へ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "選択"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "選択2"
@@ -6848,6 +6923,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "服装キー"
@@ -7224,94 +7304,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "攻撃力:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "機敏さ:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "防御力:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "魔力:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "命中率:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "幸運:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "アクセスできません。サーバーが混みあっています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "このIDは使用できません."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "不明なキャラクターサーバーエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "名前が違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "間違った統計."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "間違った髪型."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "間違ったスロット."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "種別が間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "キャラクターを削除しました."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
@@ -7458,43 +7508,43 @@ msgstr "新しいパスワードは文字数が足りません."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "不明なエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "未登録なID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "アップデートが必要です."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7504,22 +7554,22 @@ msgstr ""
 "GMにご連絡下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "メールアドレスが違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました."
 
@@ -7529,12 +7579,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "ネットワークに空のアドレスが送信されました::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "ホスト名を解決できません"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "サーバーへの接続が切断されました. "
 
@@ -7556,261 +7606,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "トレード失敗!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "スマイリー表示失敗!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "座れません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "チャット作成失敗!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "パーティに参加できませんでした!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "叫べません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分なlvlに達していません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "メモがありません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "今この行動はできません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "GPが足りません... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "このスキルはこの武器と一緒に使えません!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Red Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Blue Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "アイテムを持ちすぎています!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "うん？何それ?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "ワープに失敗しました..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "何も盗めませんでした..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "毒の影響はなかった..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "攻撃力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "機敏さ"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "防御力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "魔力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "命中率"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "ダメージ/秒."
 
@@ -7826,6 +7876,36 @@ msgstr "あなたと%sとのトレード"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたにトレードを申請しています?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "攻撃力:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "機敏さ:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "防御力:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "魔力:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "命中率:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "幸運:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7866,85 +7946,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -8299,6 +8379,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "認証に失敗しました."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ka.po b/po/ka.po
index 471542eeb..7965794c1 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr ""
 
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6215,66 +6215,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7798,7 +7803,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index d111021b7..b0dfb61bb 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -40,123 +40,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -165,109 +165,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr ""
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr ""
 
@@ -282,77 +282,77 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +361,43 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,37 +435,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -481,9 +481,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -613,36 +613,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr ""
 
@@ -1022,7 +1022,7 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1031,7 +1031,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr ""
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1445,7 +1445,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr ""
 
@@ -1468,28 +1468,28 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1497,7 +1497,7 @@ msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1516,46 +1516,47 @@ msgstr ""
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr ""
 
@@ -1579,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1611,12 +1612,12 @@ msgstr ""
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr ""
 
@@ -1624,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1737,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1809,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1890,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,51 +1957,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr ""
 
@@ -2008,150 +2009,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr ""
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2165,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2173,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr ""
 
@@ -2227,7 +2233,7 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2255,10 +2261,10 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr ""
 
@@ -2314,7 +2320,7 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
@@ -2497,25 +2503,125 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr ""
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr ""
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr ""
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr ""
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr ""
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
 #, c-format
-msgid "Mana: -%d"
+msgid "Type: %s"
 msgstr ""
 
+#. TRANSLATORS: Skill type
 #: src/gui/widgets/skillinfo.cpp:107
+msgid "Unknown"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+msgid "Target trap"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+msgid "Unknown:"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:147
+#, c-format
+msgid " / Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3292,39 +3398,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3332,234 +3438,234 @@ msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3567,173 +3673,178 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+msgid "Ignore logging packets"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3965,7 +4076,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4648,7 +4759,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr ""
 
@@ -4659,7 +4770,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr ""
 
@@ -4753,75 +4864,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr ""
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr ""
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr ""
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr ""
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr ""
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr ""
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4843,19 +4898,19 @@ msgid "Type new email address twice:"
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr ""
 
@@ -4873,7 +4928,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr ""
@@ -4884,29 +4939,29 @@ msgid "Type new password twice:"
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4914,9 +4969,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr ""
 
@@ -4924,11 +4979,11 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
@@ -4937,72 +4992,72 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5031,7 +5086,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
@@ -5039,36 +5094,36 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5078,16 +5133,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr ""
 
@@ -5152,7 +5207,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr ""
 
@@ -5187,10 +5242,22 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+msgid "Select egg"
+msgstr ""
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5409,8 +5476,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr ""
 
@@ -5526,7 +5593,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5547,6 +5614,17 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5574,107 +5652,96 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -5722,159 +5789,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6073,7 +6140,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6083,17 +6150,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6115,25 +6182,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6141,7 +6208,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6217,71 +6284,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Catch pet"
+msgid "Target mercenary"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6489,11 +6561,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6838,6 +6905,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7211,92 +7283,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr ""
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr ""
 
@@ -7443,43 +7485,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7487,22 +7529,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7512,12 +7554,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -7539,261 +7581,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr ""
 
@@ -7809,6 +7851,36 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr ""
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7849,85 +7921,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr ""
 
@@ -8282,6 +8354,47 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+msgid "Pet catch failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 042ae8e8b..b582d9c09 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr "Lag"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6218,66 +6218,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 549453b03..ef019c242 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -4810,7 +4810,7 @@ msgstr "Aanmaken"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -5725,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
@@ -6221,66 +6221,71 @@ msgstr "Speler viseren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7804,7 +7809,7 @@ msgid "Trade: You and %s"
 msgstr "Handelen: Jij en %s"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index f6f696216..906ee719f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -36,7 +36,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,123 +44,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -171,109 +171,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "vijand"
 
@@ -288,77 +288,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -441,37 +441,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -487,9 +487,9 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -497,32 +497,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -536,50 +536,50 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -619,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1028,7 +1028,7 @@ msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1037,7 +1037,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "standaard"
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
@@ -1474,28 +1474,28 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1503,7 +1503,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1511,7 +1511,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1522,46 +1522,47 @@ msgstr "Handel"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
@@ -1585,9 +1586,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Beweeg"
@@ -1596,7 +1597,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Spreken"
@@ -1607,7 +1608,7 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1617,12 +1618,12 @@ msgstr "Kopen"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1630,26 +1631,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1657,7 +1658,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1665,44 +1666,44 @@ msgstr "an de negeerlijst toevoegen"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1712,20 +1713,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1734,7 +1735,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1743,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1814,79 +1815,79 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -1962,51 +1963,51 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2014,150 +2015,155 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2165,7 +2171,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2173,49 +2179,49 @@ msgstr "Neerleggen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Schop"
 
@@ -2233,7 +2239,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2261,10 +2267,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Andere"
 
@@ -2320,7 +2326,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -2503,25 +2509,128 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Afsluiten"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Maximum"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Prijs: %s / Totaal: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Wijzig"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Type:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Onbekend."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Doel"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Onbekend."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3298,39 +3407,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3338,234 +3447,234 @@ msgstr "laag"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "gemiddeld"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "hoog"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Allerlei"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Automatisch enkel bereikbare monsters viseren"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Markeer het aanvalsbereik van de monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Toon hp statusbalk van monsters"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Doorloop monsterdoelwitten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Map"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Geef de poort-deeltjes weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Markeer de kaartpoorten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Markeer het aanvalsbereik van de speler"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Toon uitgebreide minimaps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Teken de weg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Teken hotkeys op de kaart"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Bewegen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Automatische positieverbetering"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Syncroniseer spelerbeweging"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Gestoorde beweging Een programma"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Doorloop spelerdoelwitten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Geef de job ervarings berichten weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Geef de spelers popups weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "'Weg van het toetsenbord'-bericht"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Geef je beroep weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3573,173 +3682,179 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Winkel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Houd de NPC dialogen bij"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Ingave 1 negeren"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Laag verkeer modus"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Verberg het schild"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Toon achtergrond"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3971,7 +4086,7 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4660,7 +4775,7 @@ msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -4671,7 +4786,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Sociaal"
 
@@ -4765,75 +4880,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prijs: %s / Totaal: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Aanmaken"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Afsluiten"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Maximum"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4855,19 +4914,19 @@ msgid "Type new email address twice:"
 msgstr "Type nieuw email adres twee maal:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "De email adres ingaven zijn niet gelijk."
 
@@ -4885,7 +4944,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -4896,29 +4955,29 @@ msgid "Type new password twice:"
 msgstr "Type nieuw paswoord tweel maal:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Geef het oude paswoord eerst."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4926,9 +4985,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Naam:"
 
@@ -4936,11 +4995,11 @@ msgstr "Naam:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4949,72 +5008,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Vrouwelijk"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -5043,7 +5102,7 @@ msgstr "Verwissel Login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spelen"
@@ -5051,36 +5110,36 @@ msgstr "Spelen"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Wijzig Email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5090,16 +5149,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -5164,7 +5223,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -5199,10 +5258,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "OK selecteren"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5421,8 +5493,8 @@ msgstr "Wijzig Server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Aanmelden"
 
@@ -5538,7 +5610,7 @@ msgstr "Indienen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5559,6 +5631,17 @@ msgstr "Verzenden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "verkoop voorwerp"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5586,107 +5669,96 @@ msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "verkoop voorwerp"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -5734,159 +5806,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -6087,7 +6159,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -6097,17 +6169,17 @@ msgid "Update"
 msgstr "Bijwerken"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -6129,25 +6201,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6155,7 +6227,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "u key"
 
@@ -6231,71 +6303,77 @@ msgstr "Speler viseren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Doel Party:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6503,11 +6581,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6852,6 +6925,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7225,94 +7303,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Sterkte:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agiliteit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitaliteit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Intelligentie:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Dexteriteit:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Geluk:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -7459,43 +7507,43 @@ msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7505,22 +7553,22 @@ msgstr ""
 "Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd."
 
@@ -7530,12 +7578,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Niet mogelijk te resolven van host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
@@ -7559,261 +7607,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Emoticon gefaald!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Chatcreatie mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Kan je niet bij de groep voegen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Kan niet roepen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Warp mislukt..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Kon niets stelen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Handigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr ""
 
@@ -7829,6 +7877,36 @@ msgstr "Handelen: Jij en %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Sterkte:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agiliteit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitaliteit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Intelligentie:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Dexteriteit:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Geluk:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7869,85 +7947,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -8303,6 +8381,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Authenticatie gefaald."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 6a10751c4..b15b2add1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -48,123 +48,123 @@ msgstr "Plik wysłano"
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d tygodni/e"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni/e"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dni"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d godzin/y"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minut/y"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d sekund/y"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,109 +174,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Brak nazwy gildii."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "znajomy"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "lekceważony"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutralny"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "wróg"
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -371,43 +371,43 @@ msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -417,8 +417,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -445,37 +445,37 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -491,9 +491,9 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -501,32 +501,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -540,50 +540,50 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -623,36 +623,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1032,7 +1032,7 @@ msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
@@ -1041,7 +1041,7 @@ msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "domyślnie"
@@ -1203,8 +1203,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1455,7 +1455,7 @@ msgstr "Komentarz: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
@@ -1478,28 +1478,28 @@ msgstr "Utwórz grupę"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1507,7 +1507,7 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
@@ -1515,7 +1515,7 @@ msgstr "Waga: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1526,46 +1526,47 @@ msgstr "Handel"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Atak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
@@ -1589,9 +1590,9 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Podejdź"
@@ -1600,7 +1601,7 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Rozmowa"
@@ -1611,7 +1612,7 @@ msgstr "Rozmowa"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1621,12 +1622,12 @@ msgstr "Kup"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1634,26 +1635,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1661,7 +1662,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1669,44 +1670,44 @@ msgstr "Dodaj do listy ignorowanych"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Portal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1716,20 +1717,20 @@ msgstr "Zmień nazwę"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -1738,7 +1739,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1746,69 +1747,69 @@ msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1818,79 +1819,79 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nick:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -1899,64 +1900,64 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -1966,51 +1967,51 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "W dół"
 
@@ -2018,150 +2019,155 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imituj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2169,7 +2175,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Upuść"
@@ -2177,49 +2183,49 @@ msgstr "Upuść"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Podziel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Wyrzuć"
 
@@ -2237,7 +2243,7 @@ msgstr "Skróty"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Okna"
@@ -2265,10 +2271,10 @@ msgstr "Czat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Inne"
 
@@ -2324,7 +2330,7 @@ msgstr "NPC"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Potwory"
 
@@ -2507,25 +2513,130 @@ msgstr "Ekw."
 msgid "Open url"
 msgstr "Otwórz adres url"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Wyjdź"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Maks."
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Cena: %s/ Razem: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Edycja"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Typ:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Nieznany obiekt."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Integracja z botami"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Rodzaj celu:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Nieznany obiekt."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3304,39 +3415,39 @@ msgid "No mods present"
 msgstr "Brak modów"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Zawsze pokazuj"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Autoukrywanie w małej rozdzielczości"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Autoukrywanie"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Proxy systemowe"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Bezpośrednie połączenie"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "Nazwa hosta SOCKS5"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3344,234 +3455,234 @@ msgstr "niskie"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "średnie"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "wysokie"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xduża"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxduża"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Różne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Pokaż zadane potworom obrażenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Automatycznie namierzaj tylko dosięgalne potwory"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Podświetl zasięg ataku potworów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Pokazuj pasek życia potworów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Przewijaj namierzanie potworów"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Włącz efekty portali"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Podświetl portale na mapie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Podświetl przedmioty na podłodze"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Podświetl zasięg ataku graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Pokaż rozszerzone minimapy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Rysuj ścieżkę"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Rysuj klawisze skrótu na mapie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Włącz leniwe przewijanie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Leniwość przewijania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Promień przewijania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Automatycznie zmieniaj rozmiar minimap"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Pokazuj animacje mapy"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Poruszanie się"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Koryguj pozycję automatycznie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Pokazuj pozycję po stronie serwera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Atakuj podczas poruszania się"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Atakuj następny cel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synchronizuj ruchy graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Szalone ruchy: program A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Ruchy relatywne myszką (zalecane do interfejsów dotykowych)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Gracze"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Pokazuj własny pasek życia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Włącz szybkie statystyki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Przewijaj namierzanie graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Pokazuj wyskakujące powiadomienia graczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Wiadomość AFK"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Pokazuj poziom umiejętności"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Filtruj ataki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Włącz filtr podnoszenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Włącz protokół reklamowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Aktywuj obsługę zwierzątek."
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Aktywuj powiadomienia dotyczące wagi."
 
@@ -3579,173 +3690,179 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Sklep"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Akceptuj prośby o handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Przewijaj namierzanie NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Integracja z botami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Włącz integrację z AuctionBotem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Klawiatura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Opóźnienie powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Własny interwał powtarzania"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "Ukryj stronę wsparcia po wystąpieniu błędu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Aktywuj podwójne kliknięcia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Imiona ignorowanych"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Włącz logowanie OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Aktywuj logowanie wejścia"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr "Wyślij plik dziennika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Folder zrzutów ekranu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Opóźnienie sieci między podserwerami"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Pokazuj tło"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Nadpisanie gęstości ekranu"
 
@@ -3979,7 +4096,7 @@ msgstr "Zezwól na szepty"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4667,7 +4784,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -4678,7 +4795,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Społeczność"
 
@@ -4772,75 +4889,19 @@ msgid "Create items"
 msgstr "Utwórz przedmioty"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Cena: %s/ Razem: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Ilość:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Utwórz"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Wyjdź"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Maks."
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4862,19 +4923,19 @@ msgid "Type new email address twice:"
 msgstr "Proszę wpisać i potwierdzić adres e-mail:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Nowy adres e-mail musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Nowy adres e-mail musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Pola adresu e-mail się nie zgadzają."
 
@@ -4892,7 +4953,7 @@ msgstr "Zmień hasło"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Hasło:"
@@ -4903,29 +4964,29 @@ msgid "Type new password twice:"
 msgstr "Proszę wpisać i potwierdzić hasło:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Proszę wpisać stare hasło."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Nowe hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Nowe hasło nie może mieć mniej znakół niż %u."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Potwierdzenie hasła nie zgadza się."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Nowa postać"
 
@@ -4933,9 +4994,9 @@ msgstr "Nowa postać"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -4943,11 +5004,11 @@ msgstr "Nazwa:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4956,72 +5017,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Fryzura:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Mężczyzna"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Kobieta"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -5050,7 +5111,7 @@ msgstr "Przeloguj się"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Graj"
@@ -5058,36 +5119,36 @@ msgstr "Graj"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Konto: %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5102,16 +5163,16 @@ msgstr ""
 "Doświadczenie: %u\n"
 "Pieniądze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
@@ -5176,7 +5237,7 @@ msgstr "Edytuj serwer"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Połącz"
 
@@ -5211,10 +5272,23 @@ msgid "Online list url:"
 msgstr "Adres strony z graczami online:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Wybierz"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Wybierz"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5435,8 +5509,8 @@ msgstr "Zmień serwer"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -5552,7 +5626,7 @@ msgstr "Zatwierdź"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5573,6 +5647,17 @@ msgstr "Wyślij"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "sprzedaj przedmiot"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Czy naprawdę chcesz sprzedać %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5600,107 +5685,96 @@ msgid "Switch character"
 msgstr "Zmień postać"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Nazwa użytkownika musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Nazwa użytkownika musi być krótsza niż %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Hasło musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "sprzedaj przedmiot"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Czy naprawdę chcesz sprzedać %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -5748,159 +5822,159 @@ msgstr "Aukcja"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -6101,7 +6175,7 @@ msgid "Completed"
 msgstr "Zakończono"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
@@ -6111,17 +6185,17 @@ msgid "Update"
 msgstr "Aktualizuj"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Gracze online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -6143,25 +6217,25 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6169,7 +6243,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -6245,71 +6319,77 @@ msgstr "Namierz Gracza"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Rasa celu:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Inne"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Podnieś"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Zmień sposób podnoszenia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Otwórz okno handlu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Zmień widok mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Wybrano OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Zatrzymaj się lub usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Powrót do bezpiecznego trybu wyświetlania"
 
@@ -6517,11 +6597,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Wybierz"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Wybierz2"
@@ -6866,6 +6941,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Klawisze ubioru"
@@ -7239,92 +7319,62 @@ msgstr "  -T --test           : Rozpocznij test sterowników i autokonfigurację
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Siła:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Szybkość:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Witalność:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Inteligencja:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Celność:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Szczęście:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Nie można użyć tego ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Nieznany błąd serwera postaci."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Nieprawidłowe staty."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Nieprawidłowe włosy."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Nieprawidłowe miejsce inwentarza."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Nieprawidłowa rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Niewłaściwy wygląd."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Postać skasowana."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
@@ -7473,43 +7523,43 @@ msgstr "Nowe hasło jest zbyt krótkie."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7519,22 +7569,22 @@ msgstr ""
 "Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Nieprawidłowy adres e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
@@ -7544,12 +7594,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Network::connect() otrzymał pusty adres!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Nie można było odnaleźć serwera."
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Połączenie z serwerem przerwane. "
 
@@ -7574,261 +7624,261 @@ msgstr ""
 "zdrowie."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Handel zakończony niepowodzeniem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Emotka nieudana!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Nie można usiąść!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Nie można stworzyć czatu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Nie udało się dołączyć do grupy!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Nie można krzyczeć!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nie masz jeszcze wymaganego poziomu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Zbyt niskie HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Zbyt niska mana!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Nie masz notek!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Nie możesz tego teraz zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Chyba brak Ci kasy... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Niesiesz za duży ciężar by to zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Eee? A to to co?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Nie udało się przeteleportować..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Nie udało się niczego ukraść..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Siła %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Zwinność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Żywotność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencja %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Celność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Szczęście %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Siła"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Zwinność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Witalność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Inteligencja"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Celność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Szczęście"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Obrona"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Atak mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Obrona mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
@@ -7844,6 +7894,36 @@ msgstr "Handel: Ty i %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z Tobą, zgadzasz się?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Siła:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Szybkość:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Witalność:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Inteligencja:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Celność:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Szczęście:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7884,85 +7964,85 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr "Atak krytyczny %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr "Atak magią %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr "Obrona krytyczna %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr "Obrona magiczna %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "PŻ %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Poziom %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr "Prędkość poruszania %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr "Zasięg %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr "Ominięcie %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -8321,6 +8401,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Błąd uwierzytelniania."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index edf162784..9bf5456d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -36,7 +36,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,123 +44,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -171,109 +171,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador(a)!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "Inimigo"
 
@@ -288,77 +288,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -413,8 +413,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -441,37 +441,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -487,9 +487,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -497,32 +497,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -536,50 +536,50 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -619,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1028,7 +1028,7 @@ msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1037,7 +1037,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "padrão"
@@ -1199,8 +1199,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1451,7 +1451,7 @@ msgstr "Comentário: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Criar grupo"
 
@@ -1474,28 +1474,28 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1503,7 +1503,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1511,7 +1511,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1522,46 +1522,47 @@ msgstr "Negócios"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
@@ -1585,9 +1586,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1596,7 +1597,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Falar"
@@ -1607,7 +1608,7 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1617,12 +1618,12 @@ msgstr "Comprar"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Vender"
 
@@ -1630,26 +1631,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1657,7 +1658,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1665,44 +1666,44 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1712,20 +1713,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1734,7 +1735,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1743,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Sair"
 
@@ -1814,79 +1815,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1895,64 +1896,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1962,51 +1963,51 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2014,150 +2015,155 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2165,7 +2171,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Descartar"
@@ -2173,49 +2179,49 @@ msgstr "Descartar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2233,7 +2239,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Janelas"
@@ -2261,10 +2267,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Outro"
 
@@ -2320,7 +2326,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -2503,25 +2509,130 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "Abrir URL"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Sair"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Máximo"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Preço: %s / Total: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Editar"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipo:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Desconhecido."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Suporte de bots"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Tipo de alvo:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Desconhecido."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3300,39 +3411,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Sempre mostrar"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Sempre alto ocultar"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Proxy de sistema"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Conexão Direta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3340,234 +3451,234 @@ msgstr "Baixo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "médio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xalta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxalta"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Diversos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Auto redimensionar mapas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Atacar próximo alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimentos relativos do mouse (bom para interfaces de toque)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de pegar itens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
@@ -3575,173 +3686,179 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Alvo de NPC em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição customizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Nome de Ignorados"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre os sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Substituição de densidade de tela"
 
@@ -3973,7 +4090,7 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4660,7 +4777,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4671,7 +4788,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Social"
 
@@ -4765,75 +4882,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preço: %s / Total: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Quantidade:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Criar"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Sair"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Máximo"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4855,19 +4916,19 @@ msgid "Type new email address twice:"
 msgstr "Digite o novo email duas vezes:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "O novo email deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ".O novo email precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
@@ -4885,7 +4946,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Senha:"
@@ -4896,29 +4957,29 @@ msgid "Type new password twice:"
 msgstr "Digite a nova senha duas vezes:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Primeiro entre com a antiga senha."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Novo Pesonagem"
 
@@ -4926,9 +4987,9 @@ msgstr "Novo Pesonagem"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nome:"
 
@@ -4936,11 +4997,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4949,72 +5010,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -5043,7 +5104,7 @@ msgstr "Trocar Login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jogar"
@@ -5051,36 +5112,36 @@ msgstr "Jogar"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5095,16 +5156,16 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -5169,7 +5230,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5204,10 +5265,23 @@ msgid "Online list url:"
 msgstr "URL de lista onlines:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Selecionar"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Selecionar"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5426,8 +5500,8 @@ msgstr "Trocar servidor"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrar"
 
@@ -5543,7 +5617,7 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5564,6 +5638,17 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "Vender item"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Você realmente deseja vender %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5591,107 +5676,96 @@ msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O Usuários deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O Usuário  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "Vender item"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Você realmente deseja vender %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -5739,159 +5813,159 @@ msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -6091,7 +6165,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -6101,17 +6175,17 @@ msgid "Update"
 msgstr "Atualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -6133,25 +6207,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6159,7 +6233,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "Tecla u"
 
@@ -6235,71 +6309,77 @@ msgstr "Selecionar Jogador"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Corrida do alvo:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Retornar para modo seguro de vídeo"
 
@@ -6507,11 +6587,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Selecionar"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Selecionar2"
@@ -6856,6 +6931,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Teclas de roupas"
@@ -7234,92 +7314,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Força:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agilidade:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitalidade:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Inteligência:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Destreza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Sorte:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -7466,32 +7516,32 @@ msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7499,12 +7549,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7514,22 +7564,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
@@ -7539,12 +7589,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
@@ -7570,261 +7620,261 @@ msgstr ""
 "novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -7840,6 +7890,36 @@ msgstr "Negociação: Você e %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Força:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agilidade:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitalidade:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Inteligência:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Sorte:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7880,85 +7960,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -8314,6 +8394,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Falha de autenticação."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index abeb9e5cc..9cf7575ca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-17 18:45+0000\n"
+"Last-Translator: Jonatas L. Nogueira <cpntb1@ymail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -33,9 +33,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
-msgstr ""
+msgstr "Arquivo enviado"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: edit dialog label
@@ -46,7 +46,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -54,123 +54,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d Semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d Dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d Horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
-msgstr ""
+msgstr "configuaração de arquivos enviados em: "
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
-msgstr ""
+msgstr "Configuração de servidor enviado em: "
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
-msgstr ""
+msgstr "Registro enviado em: "
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -181,109 +181,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pôde ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais sendo ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
-msgstr ""
+msgstr "Jogador não mais apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Jogador não pôde ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "inimigo"
 
@@ -298,77 +298,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -377,43 +377,43 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -423,8 +423,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -451,37 +451,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -497,9 +497,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -507,32 +507,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -546,50 +546,50 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -618,7 +618,7 @@ msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
 #: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcfile dyestring dstfile"
-msgstr ""
+msgstr "cmdpintar arquivofonte linhapintar arquivodst"
 
 #: src/dyetool/dyemain.cpp:50
 msgid "or"
@@ -626,39 +626,39 @@ msgstr "ou"
 
 #: src/dyetool/dyemain.cpp:51
 msgid "dyecmd srcdyestring dstfile"
-msgstr ""
+msgstr "cmdpintar fontedelinhadepintar arquivodst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1038,7 +1038,7 @@ msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
@@ -1047,7 +1047,7 @@ msgstr "Você quer abrir a página de suporte?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "padrão"
@@ -1209,8 +1209,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1292,7 +1292,7 @@ msgstr "Espanhol"
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:77
 msgid "Swedish (Sweden)"
-msgstr ""
+msgstr "Suéco (Suécia)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:79
@@ -1461,7 +1461,7 @@ msgstr "Comentário: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Criar grupo"
 
@@ -1484,28 +1484,28 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1513,7 +1513,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1521,7 +1521,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1532,46 +1532,47 @@ msgstr "Negócios"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
@@ -1595,9 +1596,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1606,7 +1607,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Falar"
@@ -1617,7 +1618,7 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1627,12 +1628,12 @@ msgstr "Comprar"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Vender"
 
@@ -1640,26 +1641,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Add comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1667,7 +1668,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1675,44 +1676,44 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1722,20 +1723,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1744,7 +1745,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1752,69 +1753,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Sair"
 
@@ -1824,79 +1825,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1905,64 +1906,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1972,51 +1973,51 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2024,150 +2025,155 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2175,7 +2181,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Descartar"
@@ -2183,49 +2189,49 @@ msgstr "Descartar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Checar ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2243,7 +2249,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Janelas"
@@ -2271,10 +2277,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Outro"
 
@@ -2330,7 +2336,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -2513,28 +2519,133 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "Abrir URL"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Sair"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Máximo"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Preço: %s / Total: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Editar"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
-#, c-format
-msgid "Mana: -%d"
-msgstr ""
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipo:"
 
+#. TRANSLATORS: Skill type
 #: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Desconhecido."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surrond"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Suporte de bots"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Tipo de alvo:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Desconhecido."
+
+#: src/gui/widgets/skillinfo.cpp:147
+#, fuzzy, c-format
+msgid " / Mana: -%d"
+msgstr "Mana: -%d"
+
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
-msgstr ""
+msgstr "Alcance: %d"
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -3310,39 +3421,39 @@ msgid "No mods present"
 msgstr "Nenhum mods disponível"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Sempre mostrar"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Sempre ocultar"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Sistema proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Conexão direta"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3350,234 +3461,234 @@ msgstr "baixo"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "médio"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "alto"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xalta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxalta"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Diversos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Redirecionamento automático de mapas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Mostrar animações de mapa"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Mostrar posição do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Atacar próximo ao alvo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Movimentos relativos ao mouse (bom para interfaces de toque)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Mostrar job"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Habilitar filtro de captura"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Habilitar suporte de animais"
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Habilitar notificações de peso"
 
@@ -3585,173 +3696,179 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Loja"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Alvo NPC em ciclos"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Suporte de bots"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Ativar suporte ao auction bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Atraso de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Intervalo de repetição"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Intervalo de repetição personalizado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "Esconder link da página de suporte em erros"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Habilitar duplo clique"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Nomes de Ignorados"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Ativar LOG OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Habilitar log de entrada"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
-msgstr ""
+msgstr "Arquivo de registro enviado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Diretório de screenshot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Atraso de rede entre sub servidores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Ultrapassar Densidade da tela"
 
@@ -3821,7 +3938,7 @@ msgstr "Mostrar transparencia"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:110
 msgid "Enable reorder sprites (need for mods support)."
-msgstr ""
+msgstr "Habilitar reordenação de sprites (necessário para suporte de mods)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:115
@@ -3987,7 +4104,7 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4674,7 +4791,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4685,7 +4802,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Social"
 
@@ -4779,75 +4896,19 @@ msgid "Create items"
 msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preço: %s / Total: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Quantidade:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Criar"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Sair"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Máximo"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4869,19 +4930,19 @@ msgid "Type new email address twice:"
 msgstr "Digite o novo email duas vezes:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "O novo email deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "A nova senha deve ter menos que %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
@@ -4899,7 +4960,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Senha:"
@@ -4910,29 +4971,29 @@ msgid "Type new password twice:"
 msgstr "Digite a nova senha duas vezes:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Primeiro entre com a antiga senha."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "A nova senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Novo Personagem"
 
@@ -4940,9 +5001,9 @@ msgstr "Novo Personagem"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Nome:"
 
@@ -4950,11 +5011,11 @@ msgstr "Nome:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4963,72 +5024,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -5057,7 +5118,7 @@ msgstr "Trocar Login"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jogar"
@@ -5065,36 +5126,36 @@ msgstr "Jogar"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
-msgstr ""
+msgstr "Por favor insira novo pincode"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5109,16 +5170,16 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -5183,7 +5244,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5218,10 +5279,23 @@ msgid "Online list url:"
 msgstr "URL de lista online:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Selecionar"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Selecionar"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5440,8 +5514,8 @@ msgstr "Trocar servidor"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrar"
 
@@ -5557,7 +5631,7 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5578,6 +5652,17 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "Vender itens"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Você realmente quer vender: %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5605,107 +5690,96 @@ msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O nome do usuário precisa ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O nome do usuário deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "Vender itens"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Você realmente quer vender: %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -5753,159 +5827,159 @@ msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -6105,7 +6179,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -6115,17 +6189,17 @@ msgid "Update"
 msgstr "Atualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -6147,25 +6221,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6173,7 +6247,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "tecla u"
 
@@ -6249,71 +6323,77 @@ msgstr "Selecionar Jogador"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Catch pet"
-msgstr ""
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Raça do alvo:"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Catch pet"
+msgstr "Pegar animal"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Abrir janela de troca"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr "Inicia troca com o alvo."
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr "Segue o jogador selecionado"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Retornar para o modo seguro de vídeo"
 
@@ -6405,7 +6485,7 @@ msgstr "Tecla modificadora de emoção"
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
 msgid "Pet emote modifier key"
-msgstr ""
+msgstr "Tecla modificadora de emoção de pet"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6444,7 +6524,7 @@ msgstr "Atalho para emoticon %d"
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
 msgid "Pet emote shortcuts"
-msgstr ""
+msgstr "Atalhos de emoções de pet"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6473,7 +6553,7 @@ msgstr ""
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
 #, c-format
 msgid "Pet emote shortcut %d"
-msgstr ""
+msgstr "Atalho para emoticon de pet %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -6521,11 +6601,6 @@ msgid "Page down"
 msgstr "Page down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Selecionar"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Selecionar2"
@@ -6752,7 +6827,7 @@ msgstr "Mostrar teclado virtual"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:216
 msgid "Clean cached graphics"
-msgstr ""
+msgstr "Limpar cache de gráficos"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:222
@@ -6767,7 +6842,7 @@ msgstr "Copia todos os jogadores visiveis pra o chat."
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:234
 msgid "Print all visible beings in chat"
-msgstr ""
+msgstr "Imprimir todos os seres visíveis no bate-papo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:240
@@ -6782,7 +6857,7 @@ msgstr "Salva a lista da loja no disco."
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:252
 msgid "Print debug cache info"
-msgstr ""
+msgstr "Imprimir cache de informação de debug"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:258
@@ -6807,32 +6882,32 @@ msgstr "Criar itens (apenas para gms)"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:282
 msgid "Print configured directories in chat"
-msgstr ""
+msgstr "Imprimir diretórios configurados no bate-papo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:288
 msgid "Print client uptime in chat"
-msgstr ""
+msgstr "Imprimir tempo atual do cliente no bate-papo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:294
 msgid "Dump debug information"
-msgstr ""
+msgstr "Despejar informação de depuração"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:300
 msgid "Crash client"
-msgstr ""
+msgstr "Quebrar cliente"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:306
 msgid "Dump graphics info into chat"
-msgstr ""
+msgstr "Despejar informação de gráficos no bate-papo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:312
 msgid "Dump tests info into chat"
-msgstr ""
+msgstr "Despejar informação de testes no bate-papo"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:318
@@ -6870,6 +6945,11 @@ msgid "Upload server config"
 msgstr "Configuração do servidor de upload"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Teclas de roupas"
@@ -7247,92 +7327,62 @@ msgstr "  -T --testes         : Começa a testar drivers e a auto-configurar"
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Força:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agilidade:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitalidade:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Inteligência:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Destreza:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Sorte:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Aparência incorreta."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -7352,6 +7402,7 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 #: src/net/ea/chathandler.cpp:129
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
+"Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7479,32 +7530,32 @@ msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7512,12 +7563,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7527,22 +7578,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente."
 
@@ -7552,12 +7603,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
@@ -7583,261 +7634,261 @@ msgstr ""
 "novamente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Força %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -7853,6 +7904,36 @@ msgstr "Negociação: Você e %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Força:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agilidade:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitalidade:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Inteligência:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Destreza:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Sorte:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7893,85 +7974,85 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defesa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Nível %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidade %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr "Fugir %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -8314,17 +8395,59 @@ msgstr "pvp desconhecido"
 #: src/resources/notifications.h:315
 #, c-format
 msgid "Char from account %s is already in your party!"
-msgstr ""
+msgstr "Char da conta %s já está no seu grupo!"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:319
 #, c-format
 msgid "%s blocked invite!"
-msgstr ""
+msgstr "%s bloqueou o convite!"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:323
 msgid "Char is not online!"
+msgstr "Char não está online!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Falha de autenticação."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
diff --git a/po/ru.po b/po/ru.po
index a7407ab55..28700b7ec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:19+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 10:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -29,7 +29,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -42,7 +42,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -50,123 +50,123 @@ msgstr "Файл выгружен"
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -177,109 +177,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Не указано название группы."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr "Игрок больше не удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "друг"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "нейтральный"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "враг"
 
@@ -294,77 +294,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Человек"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "уклонение"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "Б"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -420,8 +420,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -448,37 +448,37 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -494,9 +494,9 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -504,32 +504,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -543,50 +543,50 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -626,36 +626,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1035,7 +1035,7 @@ msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
@@ -1044,7 +1044,7 @@ msgstr "Открыть страницу поддержки?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "По умолчанию"
@@ -1206,8 +1206,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1458,7 +1458,7 @@ msgstr "Комментарий: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Создать группу"
 
@@ -1481,28 +1481,28 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1510,7 +1510,7 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
@@ -1518,7 +1518,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Торговать"
@@ -1529,46 +1529,47 @@ msgstr "Торговать"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
@@ -1592,9 +1593,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Движение"
@@ -1603,7 +1604,7 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Разговор"
@@ -1614,7 +1615,7 @@ msgstr "Разговор"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1624,12 +1625,12 @@ msgstr "Купить"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Продать"
 
@@ -1637,26 +1638,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1664,7 +1665,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1672,44 +1673,44 @@ msgstr "Добавить в список игнорирования"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Элемент карты"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1719,20 +1720,20 @@ msgstr "Переименовать"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -1741,7 +1742,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1749,69 +1750,69 @@ msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1821,79 +1822,79 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Имя:                     "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -1902,64 +1903,64 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -1969,51 +1970,51 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2021,150 +2022,155 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2172,7 +2178,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Бросить"
@@ -2180,49 +2186,49 @@ msgstr "Бросить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Кикнуть"
 
@@ -2240,7 +2246,7 @@ msgstr "Горячие клавиши"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Окна"
@@ -2268,10 +2274,10 @@ msgstr "Чат"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Другое"
 
@@ -2327,7 +2333,7 @@ msgstr "Боты"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Монстры"
 
@@ -2510,25 +2516,130 @@ msgstr "Од."
 msgid "Open url"
 msgstr "Открыть ссылку"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Выход"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Макс"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Цена: %s / Всего: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Изменить"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
-#, c-format
-msgid "Mana: -%d"
-msgstr "Мана: -%d"
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Введите:"
 
+#. TRANSLATORS: Skill type
 #: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Неизвестно."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "окружение"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Поддержка ботов"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Тип цели:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Неизвестно."
+
+#: src/gui/widgets/skillinfo.cpp:147
+#, fuzzy, c-format
+msgid " / Mana: -%d"
+msgstr "Мана: -%d"
+
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr "Дистанция: %d"
@@ -3307,39 +3418,39 @@ msgid "No mods present"
 msgstr "Для данного сервера моды не существуют"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Всегда показывать"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Скрывать с небольшим разрешением"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Всегда скрывать"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "Системный прокси"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Прямое соединение"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 хост"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3347,234 +3458,234 @@ msgstr "низ."
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "средне"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "ТВ"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "выс."
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "большой_2"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "большой_3"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Разное"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нанесенные монстрам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Карта"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Рисовать путь"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Рисовать клавиши на карте"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Включить ленивую прокрутку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "ленивая прокрутка"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "радиус прокрутки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Автоматически менять размер миникарты"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr "Играть анимацию карт"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Движения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr "Показывать позицию со стороны сервера"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Атаковать следующую цель"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Синх. движение"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Относительное движение мышью (подходит для тач интерфейсов)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Включить фильтр поднятия"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr "Включить поддержку животных"
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Включить напоминание о весе"
 
@@ -3582,173 +3693,179 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Магазин"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Прокручивать прицел по НИП (NPC)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст НИП"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Включить поддержку бота AuctionBot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Задержка перед повтором"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Интервал повторения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Специальное время повтора клавиш"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Тип прокси"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr "При выводе ошибки, прятать ссылку на страницу поддержки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Включить поддержку двойного клика"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Имена игнорируемых"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Включить лог OpenGL"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Включить лог ввода"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr "Выгрузить лог файл"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку щита"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr "Путь для снимков экрана"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Задержка между сетевыми соединениями"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Показать фон"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Переопределение плотности экрана"
 
@@ -3986,7 +4103,7 @@ msgstr "Разрешить шептание"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4675,7 +4792,7 @@ msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Умения"
 
@@ -4686,7 +4803,7 @@ msgstr "ОБЩ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Общество"
 
@@ -4780,75 +4897,19 @@ msgid "Create items"
 msgstr "Создание предметов"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Цена: %s / Всего: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Количество:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Создать"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Выход"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Макс"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4870,19 +4931,19 @@ msgid "Type new email address twice:"
 msgstr "Введите новый адрес E-mail дважды:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Новый адрес email должен содержать не менее %u символов."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Новый адрес email должен содержать не более %u символов."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "Адрес E-mail не совпадает."
 
@@ -4900,7 +4961,7 @@ msgstr "Изменить пароль"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Пароль:"
@@ -4911,29 +4972,29 @@ msgid "Type new password twice:"
 msgstr "Введите новый пароль дважды:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Введите старый пароль."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Пароль должен содержать не менее %u символов."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Новый пароль не совпадает."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Новый персонаж"
 
@@ -4941,9 +5002,9 @@ msgstr "Новый персонаж"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Имя:"
 
@@ -4951,11 +5012,11 @@ msgstr "Имя:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4964,72 +5025,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Стрижка:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Мужчина"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Женщина"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -5058,7 +5119,7 @@ msgstr "Сменить героя"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Играть"
@@ -5066,36 +5127,36 @@ msgstr "Играть"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Сведения"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr "Пожалуйста, установите новый пин код"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5110,16 +5171,16 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
@@ -5184,7 +5245,7 @@ msgstr "Редактирование сервера"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -5219,10 +5280,23 @@ msgid "Online list url:"
 msgstr "URL онлайн списка:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотя бы адрес и порт сервера."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Выбор"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Выбор"
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5443,8 +5517,8 @@ msgstr "Сменить сервер"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Регистрация"
 
@@ -5560,7 +5634,7 @@ msgstr "Применить"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5581,6 +5655,17 @@ msgstr "Отправить"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "продажа предмета"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Вы действительно хотите продать %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5608,107 +5693,96 @@ msgid "Switch character"
 msgstr "Сменить персонажа"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Имя пользователя должно содержать не менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Имя пользователя должно содержать менее %u символов."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Пароль должен содержать не менее %u символов."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "продажа предмета"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Вы действительно хотите продать %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -5756,159 +5830,159 @@ msgstr "Аукцион"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не первое."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Имя группы"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -6109,7 +6183,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -6119,17 +6193,17 @@ msgid "Update"
 msgstr "Обновить"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -6151,25 +6225,25 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6177,7 +6251,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "неиз."
 
@@ -6253,71 +6327,77 @@ msgstr "Выбор игрока"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Catch pet"
-msgstr ""
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Раса цели:"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Catch pet"
+msgstr "Поймать питомца"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Поднятие предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Приседание/Вставание"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Создание скриншота"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr "Открывает окно обмена"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr "Начать обмен"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr "Следовать за игроком"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Выбор OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Остановиться или сесть"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Вернуться в безопасный видео режим"
 
@@ -6525,11 +6605,6 @@ msgid "Page down"
 msgstr "Страница вниз"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr "Выбор"
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr "Выбор2"
@@ -6874,6 +6949,11 @@ msgid "Upload server config"
 msgstr "Выгрузить конфиг сервера"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Кнопки нарядов"
@@ -7249,94 +7329,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Сила (str):"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Выносливость (agi):"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Живучесть (vit):"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Интеллект (int):"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Ловкость (dex):"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Удача (luk):"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Неправильная раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Неправильная внешность."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Персонаж удален."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -7483,43 +7533,43 @@ msgstr "Новый пароль слишком короткий."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Неверный пароль."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Клиент устарел."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7528,22 +7578,22 @@ msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Сервер переполнен."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Пользователь удален."
 
@@ -7553,12 +7603,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Пустой адрес был передан методу Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Не удалось найти хост \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано. "
 
@@ -7584,261 +7634,261 @@ msgstr ""
 "восстанавливаться."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Не удалось начать торговлю!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Не удалось использовать смайлик!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Не удалось присесть!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Не удалось создать чат!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Нельзя присоединиться к группе!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Нельзя кричать!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Изменение не удалось..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Не удалось ничего украсть..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Сила (str)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
@@ -7854,6 +7904,36 @@ msgstr "Торговля: Вы и %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Сила (str):"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Выносливость (agi):"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Живучесть (vit):"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Интеллект (int):"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Ловкость (dex):"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Удача (luk):"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7894,85 +7974,85 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критическая атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr "Защита от критической атаки %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "Жизнь %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Уровень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr "Скорость %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr "Расстояние %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr "Уклонение %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -8327,6 +8407,48 @@ msgstr "%s заблокировал приглашение!"
 msgid "Char is not online!"
 msgstr "Игрок не онлайн!"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Ошибка авторизации."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 9e60cf8ea..7a2685e8d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -4808,7 +4808,7 @@ msgstr "Vytvoriť"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -5725,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6221,66 +6221,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7804,7 +7809,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 90f35053d..dcc64c2d8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr ""
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6218,66 +6218,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 918831302..e2a4bd830 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr "Skapa"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -5722,7 +5722,7 @@ msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
@@ -6218,66 +6218,71 @@ msgstr "Target Spelare"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+msgid "Catch pet"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr "Trade: Du och %s"
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 0b8aec186..18cc13a4d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
 "manaplus/language/sv_SE/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -41,123 +41,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Det går inte skicka tomma viskningar!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -168,109 +168,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Gruppnamn saknas."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Guild-namn saknas."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Meddelande stänger chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Enter nu, växlar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr "enemy"
 
@@ -285,77 +285,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr "Människa"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du blev dödad av herr %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -364,43 +364,43 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -410,8 +410,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -438,37 +438,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -484,9 +484,9 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -494,32 +494,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -533,50 +533,50 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -616,36 +616,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1025,7 +1025,7 @@ msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
@@ -1034,7 +1034,7 @@ msgstr "Vill du öppna support-sidan?"
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "standard"
@@ -1196,8 +1196,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1448,7 +1448,7 @@ msgstr "Kommentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Skapa Party"
 
@@ -1471,28 +1471,28 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1500,7 +1500,7 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
@@ -1508,7 +1508,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1519,46 +1519,47 @@ msgstr "Trade"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
@@ -1582,9 +1583,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Flytta"
@@ -1593,7 +1594,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Prata med"
@@ -1604,7 +1605,7 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,12 +1615,12 @@ msgstr "Köp"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1627,26 +1628,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1654,7 +1655,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1662,44 +1663,44 @@ msgstr "Lägg till i ignoreringslistan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1709,20 +1710,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1731,7 +1732,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1739,69 +1740,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1811,79 +1812,79 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1892,64 +1893,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -1959,51 +1960,51 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2011,150 +2012,155 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2162,7 +2168,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Släng"
@@ -2170,49 +2176,49 @@ msgstr "Släng"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2230,7 +2236,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr "Fönster"
@@ -2258,10 +2264,10 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Annat"
 
@@ -2317,7 +2323,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monster"
 
@@ -2500,25 +2506,130 @@ msgstr "Eq."
 msgid "Open url"
 msgstr "Öppna url"
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Avsluta"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "Max"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Pris: %s / Totalt: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Ändra"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Typ:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Okänd."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+#, fuzzy
+msgid "Ground"
+msgstr "surround"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "Bots support"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Target-typ:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Okänd."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3297,39 +3408,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr "Visa alltid"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr "Dölj automatiskt vid låg upplösning"
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr "Dölj alltid automagiskt"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr "System-proxy"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr "Direkt-anslutning"
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostnamn"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3337,234 +3448,234 @@ msgstr "låg"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "medium"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr "tv"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "hög"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr "xhigh"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr "xxhigh"
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Misc"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Visa skada gjord mot monster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Bara nåbara monster för automatiskt target"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Highlight monsters attack-räckvidd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Visa monster hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Cycle monsters targets"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Karta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Visa warps-partiklar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "Highlight kartporträtt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Highlight golvobjekt"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Highlight spelarens attack-räckvidd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr "Visa förstorad minikarta"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Rita ut väg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Rita ut hotkeys på kartan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr "Aktivera lat-skrollning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr "Skroll-lathet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr "Skroll-radius"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr "Auto-ändra storlek för minikartan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "Förflyttning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Auto-fix position"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Attackera under rörelse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr "Attackera nästa target"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Synkronicera spelarrörelse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Crazy move A FuXual"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr "Musrelativa förflyttningar (bra för touch-gränssnitt)"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "Spelare"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Visa egen hp-bar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Aktivera quick stats"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Cycle spelarens targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "Visa jobbexp-meddelanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Visa spelar-popups"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr "Afk-meddelande"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "Visa jobb"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "Aktivera attack-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Aktivera pickup-filter"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr "Aktivera annonsprotokoll"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Aktivera vikt-notationer"
 
@@ -3572,174 +3683,180 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Shop"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Acceptera sälj/köp erbjudanden"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr "Cycle npc-targets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "Logga NPC-dialoger"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "Bots support"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr "Aktivera support för auktions-bot"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr "Tangentbord"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr "Upprepningsfördröjning"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr "Upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr "Anpassat upprepningsintervall"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr "Genvägsknappar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr "Proxy-server"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr "Proxy-typ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr "Proxy-adress:port"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Aktivera serversideattack"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr "Aktivera dubbleklick"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Aktivera bot checker"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Aktivera debug-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Ignorerade namn"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr "Aktivera OpenGL-logg"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr "Aktivera inputs-logg"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Lågtrafik-mode"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Dölj sköld"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Använd FBO för skärmdumpar (bara för openGL)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr "Nätverksfördröjning mellan underservrar"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Visa bakgrund"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr "Skärmdensitet överskrids"
 
@@ -3971,7 +4088,7 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4658,7 +4775,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Skills"
 
@@ -4669,7 +4786,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Social"
 
@@ -4763,75 +4880,19 @@ msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Pris: %s / Totalt: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr "Antal:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Skapa"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Avsluta"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "Max"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4853,19 +4914,19 @@ msgid "Type new email address twice:"
 msgstr "Skriv in e-postadressen igen:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Den nya epost-adressen måste vara minst %u tecken långt."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Den nya epost-adressen måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "E-postadressen matchar inte."
 
@@ -4883,7 +4944,7 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Lösenord:"
@@ -4894,29 +4955,29 @@ msgid "Type new password twice:"
 msgstr "Skriv in lösenordet igen:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Skriv in det gamla lösenordet först."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Det nya lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Det nya lösenordet måste vara kortare än %u tecken långt."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Det nya lösenordet matchar inte."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Ny karaktär"
 
@@ -4924,9 +4985,9 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "Namn:"
 
@@ -4934,11 +4995,11 @@ msgstr "Namn:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4947,72 +5008,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr "^"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Kvinna"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -5041,7 +5102,7 @@ msgstr "Ändra inloggad"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spela"
@@ -5049,36 +5110,36 @@ msgstr "Spela"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "Ändra lösenord"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5093,16 +5154,16 @@ msgstr ""
 "Experience: %u⏎\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -5167,7 +5228,7 @@ msgstr "Editera Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Anslut"
 
@@ -5202,12 +5263,25 @@ msgid "Online list url:"
 msgstr "Online-lista url:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
 "servern."
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Välj OK"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5426,8 +5500,8 @@ msgstr "Ändra Server"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Registrera"
 
@@ -5543,7 +5617,7 @@ msgstr "Submit"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5564,6 +5638,17 @@ msgstr "Skicka"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Misslyckades att sända som avsändare eller felaktig bokstav."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr "Sälj item"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Vill du verkligen sälja %s?"
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5591,107 +5676,96 @@ msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Godkänn:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Användarnamnet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Användarnamnet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Lösenordet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Lösenordet överensstämmer inte."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr "Sälj item"
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr "Vill du verkligen sälja %s?"
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Välj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Ladda"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Använd samma ip för spelunderservrar"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Laddar hem server-lista...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Väntar på server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "Förbereder hemladdning"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Fel uppstod när serverlistan hämtades!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "Nyare version behövs"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "v%s behövs"
@@ -5739,159 +5813,159 @@ msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vill %s %s, accepterar du?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Skapar guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "Skapar partyt %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Guild-namn"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Välj ditt guild-namn."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Du har blivit inbjuden att joina ett party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du har blivit inbjuden att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig att joina deras party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
@@ -6092,7 +6166,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -6102,17 +6176,17 @@ msgid "Update"
 msgstr "Uppdaterar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -6134,25 +6208,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6160,7 +6234,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -6236,71 +6310,77 @@ msgstr "Target Spelare"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Target race:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
@@ -6508,11 +6588,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6857,6 +6932,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr "Klädsel-knappar"
@@ -7233,94 +7313,64 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Strength:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Agility:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Vitality:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Intelligence:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Dexterity:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "Luck:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
 "taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -7467,44 +7517,44 @@ msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Okänt fel."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7514,22 +7564,22 @@ msgstr ""
 "teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
@@ -7539,12 +7589,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "Tom adress given till Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "Kan inte host:a \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "Anslutningen till servern avslutad. "
 
@@ -7566,261 +7616,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Trade misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "Emote misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "Sit misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "Chat-skapning misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Kunde inte joina partyt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "Kan inte skjuta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "Huh? Vad är det?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Warp failed..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "Kan inte stjäla något..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
@@ -7836,6 +7886,36 @@ msgstr "Trade: Du och %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Strength:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Agility:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Vitality:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Intelligence:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Dexterity:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "Luck:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7876,85 +7956,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -8309,6 +8389,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "Chat-skapning misslyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/te.po b/po/te.po
index 55688032a..e5aa2669c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -4807,7 +4807,7 @@ msgstr "సృష్టించు"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
@@ -5722,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6218,66 +6218,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7801,7 +7806,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 1337821ea..55fae42e3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr "สร้าง"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "ออก"
 
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6215,66 +6215,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7798,7 +7803,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index afe7cc5e4..37ad1a4b3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -35,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,123 +43,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "Boş sohbet gönderilemez!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -170,109 +170,109 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Grup adı eksik."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "Lonca adı eksik."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "Enter tuşu sohbeti açar/kapatır."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "Sohbeti kapatır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "Enter tuşu sohbeti sonlandırır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "Mesaj sohbeti kapatır."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "Oyuncu zaten %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Oyuncu başarı ile %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Oyuncu %s yapılamaz!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "Oyuncu görmezden gelinmiyordu!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "Oyuncu daha fazla görmezden gelinmiyor!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "Oyuncuyu görmezden gelmeme başarılı olmamadı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "Oyuncu zaten silindi!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "Oyuncu silinemedi!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "arkadaş"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "ihmal edilmiş"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "nötr"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr ""
 
@@ -287,77 +287,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "ıskalandı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan nesne toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "Nesne çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "Nesne çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr "Nesne başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr "Nesne toplamada bilinmeyen hata oluştu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -366,43 +366,43 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -412,8 +412,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -440,37 +440,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -486,9 +486,9 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -496,32 +496,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -535,50 +535,50 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "Hesap kapatma başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -618,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1027,7 +1027,7 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1036,7 +1036,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "varsayılan"
@@ -1198,8 +1198,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "Grup kur"
 
@@ -1473,28 +1473,28 @@ msgstr "Grup kur"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1502,7 +1502,7 @@ msgid "Cancel"
 msgstr "İptal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
@@ -1510,7 +1510,7 @@ msgstr "Ağırlık: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Takas"
@@ -1521,46 +1521,47 @@ msgstr "Takas"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "Saldırı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr ""
 
@@ -1584,9 +1585,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Taşı"
@@ -1595,7 +1596,7 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Konuş"
@@ -1606,7 +1607,7 @@ msgstr "Konuş"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,12 +1617,12 @@ msgstr "Satın Al"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "Sat"
 
@@ -1629,26 +1630,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr ""
 
@@ -1656,7 +1657,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1664,44 +1665,44 @@ msgstr "Gözmezden gelinenler listesine ekle"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "Gruptan at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "Harita nesnesi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr ""
 
@@ -1711,20 +1712,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1733,7 +1734,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1741,69 +1742,69 @@ msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -1813,79 +1814,79 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "Lonca pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "İsim:                    "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -1894,64 +1895,64 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Almak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -1961,51 +1962,51 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr ""
 
@@ -2013,150 +2014,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr "Taklit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2170,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Bırak"
@@ -2172,49 +2178,49 @@ msgstr "Bırak"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Bölme"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr ""
 
@@ -2232,7 +2238,7 @@ msgstr "Kısayollar"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2260,10 +2266,10 @@ msgstr "Sohbet"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr ""
 
@@ -2319,7 +2325,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Canavarlar"
 
@@ -2502,25 +2508,128 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "Çıkış"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "En Fazla"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Fiyat: %s / Toplam: %s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "Dünzenle"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tip:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "Bilinmeyen."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "Canavarı hedef al"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "Bilinmeyen."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3300,39 +3409,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3340,234 +3449,234 @@ msgstr "düşük"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "orta"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "yüksek"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "Çeşitli"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "Canavarlara verilen hasarı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "Sadece erişilebilen canavarları otomatik hedefle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "Canavar saldırı menzilini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "Canavar HP çubuğunu göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr "Canavar hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "Harita"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr "Geçiş partiküllerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "harita kapılarını vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "Zemin nesnelerini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "Oyuncu saldırı menzilini vurgula"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "Yol çiz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr "Haritada hızlı tuşları çiz"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "Otomatik konum sabitleme"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "Hareket halinde saldır"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "Oyuncu hareketlerini eşitle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "Çılgın hareket A programı"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "Kendi HP çubuğunu göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "Hızlı istatistikleri etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr "Oyuncu hedeflerini sırayla değiştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "İş tecrübe mesajlarını göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "Oyuncu açılır pencerelerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "İşi göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr "Toplama filtresini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr "Ağırlık bildirimlerini etkinleştir"
 
@@ -3575,173 +3684,179 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "Mağaza"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "Alım/Satım isteklerini kabul et"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "NPC diyaloglarını kaydet"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "Sunucu yan saldırılarını etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "Bot Kontrolörünü etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "Hata ayıklama modunu etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "Gözmezden gel giriş 1"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "Düşük trafik modu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr "Kalkan görüntüsünü gizle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "Arkaplanı göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3973,7 +4088,7 @@ msgstr "Fısıltılara izin ver"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4656,7 +4771,7 @@ msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "Yetenekler"
 
@@ -4667,7 +4782,7 @@ msgstr "SOS"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr "Sosyal"
 
@@ -4761,75 +4876,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Fiyat: %s / Toplam: %s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "Oluştur"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "Çıkış"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "En Fazla"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4851,19 +4910,19 @@ msgid "Type new email address twice:"
 msgstr "Yeni e-posta adresini tekrar yaz:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "E-posta adresleri uyuşmuyor."
 
@@ -4881,7 +4940,7 @@ msgstr "Şifre Değiştir"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "Şifre:"
@@ -4892,29 +4951,29 @@ msgid "Type new password twice:"
 msgstr "Yeni şifreni ikinci tekrar yaz:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "Önce eski şifreni yaz."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "Yeni şifre girdilerin uyuşmuyor."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4922,9 +4981,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "İsim:"
 
@@ -4932,11 +4991,11 @@ msgstr "İsim:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4945,72 +5004,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "Saç Rengi:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "Erkek"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "Kadın"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -5039,7 +5098,7 @@ msgstr "Hesap Değiştir"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Oyna"
@@ -5047,36 +5106,36 @@ msgstr "Oyna"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "Bilgi"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Kaydı Sil"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5086,16 +5145,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr ""
 
@@ -5160,7 +5219,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -5195,10 +5254,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "Seçim Tamam"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5417,8 +5489,8 @@ msgstr "Sunucu Değiştir"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "Kayıt ol"
 
@@ -5534,7 +5606,7 @@ msgstr "Onayla"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5555,6 +5627,17 @@ msgstr "Gönder"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gönderen olarak gönderme yapılamadı ya da hatalı karakter."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5582,107 +5665,96 @@ msgid "Switch character"
 msgstr "Karakter değiştir"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "Onayla:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "E-Posta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "Alt oyun sunucuları için aynı IP' yi kullan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
@@ -5730,159 +5802,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "%s isimli lonca oluşturuluyor."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "%s adlı grup kuruluyor."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "Lonca Adı"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "Loncanızın adını seçiniz."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "Bir gruba katılma daveti aldın."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s grubuna katılmaya davet edildin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s seni gruplarına davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
@@ -6083,7 +6155,7 @@ msgid "Completed"
 msgstr "Tamamlandı"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "Kimler Online - Güncelleniyor"
 
@@ -6093,17 +6165,17 @@ msgid "Update"
 msgstr "Güncelle"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "Kimler Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "Kimler Online - hata"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "Kimler Online - Güncelle"
 
@@ -6125,25 +6197,25 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6151,7 +6223,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6227,71 +6299,77 @@ msgstr "Hedef Oyuncu"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "Hedef grup:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "Topla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "Toplama Tipini Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "Otur"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "Takası Aktifleştir/Deaktifleştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "Harita Görüş Modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "Seçim Tamam"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6499,11 +6577,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6848,6 +6921,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7221,92 +7299,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "Güç:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "Çeviklik:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "Yaşam Gücü:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "Zeka:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "Maharet:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr "Yanlış yer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr ""
 
@@ -7453,43 +7501,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "Bilinemeyen hata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "Hesap silinmiş."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7497,22 +7545,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7522,12 +7570,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -7549,261 +7597,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "Takas başarılı olamadı!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "Gruba katılınamadı!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "Güç"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "Çeviklik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "Yaşam Gücü"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "Zeka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "Maharet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "Şans"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr ""
 
@@ -7819,6 +7867,36 @@ msgstr "Takas: Sen ve %s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s sana takas isteği yolladı, kabul ediyor musun?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "Güç:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "Çeviklik:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "Yaşam Gücü:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "Zeka:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "Maharet:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7859,85 +7937,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -8292,6 +8370,47 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+msgid "Pet catch failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/vls.po b/po/vls.po
index 6d735aadb..45bc47289 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr ""
 
@@ -5721,7 +5721,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6217,66 +6217,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7800,7 +7805,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cbaec2d00..225ad479a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-13 11:49+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-22 22:25+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:129
+#: src/actions/actions.cpp:130
 msgid "File uploaded"
 msgstr ""
 
@@ -40,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
+#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -48,123 +48,123 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:173
-#: src/gui/windows/changepassworddialog.cpp:163
-#: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:257
-#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/changeemaildialog.cpp:171
+#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/charcreatedialog.cpp:373
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/editserverdialog.cpp:201
+#: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
-#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
+#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
+#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
+#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:814
+#: src/actions/actions.cpp:815
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:825
+#: src/actions/actions.cpp:826
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:835
+#: src/actions/actions.cpp:836
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:845
+#: src/actions/actions.cpp:846
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:855
+#: src/actions/actions.cpp:856
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
+#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
+#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1016
+#: src/actions/actions.cpp:1017
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1136
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1145
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1154
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:220
+#: src/actions/chat.cpp:219
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白私信!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:240
+#: src/actions/chat.cpp:239
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -173,109 +173,109 @@ msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你�
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "帮会名称缺失."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:282
+#: src/actions/chat.cpp:281
 msgid "Guild name is missing."
 msgstr "公会名称缺失."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:66
+#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天."
 
-#: src/actions/chat.cpp:322
+#: src/actions/chat.cpp:321
 msgid "Message closes chat."
 msgstr "讯息关闭聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:333
+#: src/actions/chat.cpp:332
 msgid "Return now toggles chat."
 msgstr "<回车>键现在促发聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:342
+#: src/actions/chat.cpp:341
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:109
+#: src/actions/commands.cpp:108
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:120
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:123
+#: src/actions/commands.cpp:122
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:153
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:162
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:164
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:180
+#: src/actions/commands.cpp:179
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:192
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:195
+#: src/actions/commands.cpp:194
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:202
+#: src/actions/commands.cpp:201
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:208
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:215
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:222
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:229
 msgid "enemy"
 msgstr ""
 
@@ -290,77 +290,77 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1302
+#: src/actormanager.cpp:1308
 msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:346
+#: src/being/being.cpp:367
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:513
+#: src/being/being.cpp:534
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:378
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "你被 %s 杀掉了"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:819
+#: src/being/localplayer.cpp:822
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:823
+#: src/being/localplayer.cpp:826
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:827
+#: src/being/localplayer.cpp:830
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:867
+#: src/being/localplayer.cpp:870
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -368,43 +368,43 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1049 src/being/localplayer.cpp:1050
-#: src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
+#: src/being/localplayer.cpp:1089
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1060
-#: src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
+#: src/being/localplayer.cpp:1069
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2788
+#: src/being/localplayer.cpp:2792
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2794 src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2804
+#: src/being/localplayer.cpp:2808
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2810 src/being/localplayer.cpp:2824
+#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3174
+#: src/being/localplayer.cpp:3178
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -414,8 +414,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2626
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:2634
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -442,37 +442,37 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:915 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:927
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:930 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -488,9 +488,9 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
+#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -498,32 +498,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1107
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1150
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1279
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1314
+#: src/client.cpp:1319
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1326
+#: src/client.cpp:1331
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -537,50 +537,50 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
-#: src/gui/windows/changeemaildialog.cpp:170
-#: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:291
-#: src/gui/windows/editserverdialog.cpp:196
-#: src/gui/windows/registerdialog.cpp:249
-#: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
+#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
+#: src/gui/windows/changeemaildialog.cpp:168
+#: src/gui/windows/changepassworddialog.cpp:158
+#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/editserverdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:246
+#: src/gui/windows/unregisterdialog.cpp:147
+#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1410
+#: src/client.cpp:1415
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1451
+#: src/client.cpp:1456
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1453
+#: src/client.cpp:1458
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1483
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1485
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1507
+#: src/client.cpp:1512
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1509
+#: src/client.cpp:1514
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -620,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:540
+#: src/game.cpp:542
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:630
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:633
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1029,7 +1029,7 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:93
+#: src/gui/dialogsmanager.cpp:94
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1038,7 +1038,7 @@ msgstr ""
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:77
+#: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "default"
 msgstr "默认"
@@ -1200,8 +1200,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1452,7 +1452,7 @@ msgstr "评论: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
 msgid "Create Party"
 msgstr "建立"
 
@@ -1475,28 +1475,28 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
-#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
-#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
-#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
-#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
-#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
-#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
-#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
-#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
-#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
-#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
+#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
-#: src/gui/windows/charcreatedialog.cpp:130
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
 #: src/gui/windows/itemamountwindow.cpp:161
 #: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:58
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
@@ -1504,7 +1504,7 @@ msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:203
+#: src/gui/popups/itempopup.cpp:204
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -1512,7 +1512,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1523,46 +1523,47 @@ msgstr "交易"
 #. TRANSLATORS: attack monster
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
-#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
-#: src/net/tmwa/generalhandler.cpp:300
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
+#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
 msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
-#: src/gui/popups/popupmenu.cpp:769
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Invite to guild"
 msgstr ""
 
@@ -1586,9 +1587,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
-#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "移动"
@@ -1597,7 +1598,7 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "说话"
@@ -1608,7 +1609,7 @@ msgstr "说话"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1618,12 +1619,12 @@ msgstr "购买"
 #. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
-#: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
-#: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
+#: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
 msgstr "出售"
 
@@ -1631,26 +1632,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:2745
+#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
+#: src/gui/popups/popupmenu.cpp:2768
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:281
+#: src/gui/popups/popupmenu.cpp:283
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:288
+#: src/gui/popups/popupmenu.cpp:290
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:294
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1658,7 +1659,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1666,44 +1667,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
-#: src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2737
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
+#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
+#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
 msgid "Map Item"
 msgstr "地图项"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:528
+#: src/gui/popups/popupmenu.cpp:530
 msgid "Rename"
 msgstr "重命名"
 
@@ -1713,20 +1714,20 @@ msgstr "重命名"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
-#: src/gui/popups/popupmenu.cpp:2374
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
+#: src/gui/popups/popupmenu.cpp:2382
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
+#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:570
+#: src/gui/popups/popupmenu.cpp:572
 msgid "Move camera"
 msgstr ""
 
@@ -1735,7 +1736,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1743,69 +1744,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:593
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:622
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:657
+#: src/gui/popups/popupmenu.cpp:659
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:665
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:671
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:675
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:681
+#: src/gui/popups/popupmenu.cpp:683
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:687
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "留下"
 
@@ -1815,79 +1816,79 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
-#: src/gui/popups/popupmenu.cpp:2484
+#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:815
+#: src/gui/popups/popupmenu.cpp:817
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:860
+#: src/gui/popups/popupmenu.cpp:862
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1387
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1391
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1413
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1950
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1957
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1953
+#: src/gui/popups/popupmenu.cpp:1961
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1964
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade all"
 msgstr ""
 
@@ -1896,64 +1897,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1982
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:1986
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1989
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2011
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2015
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2018
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -1963,51 +1964,51 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
 #: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
-#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
+#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
+#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2161
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
+#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2259
+#: src/gui/popups/popupmenu.cpp:2267
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
 msgid "Move down"
 msgstr ""
 
@@ -2015,150 +2016,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2426
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2429
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2447
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
+#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2560
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2628
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2651
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
 msgid "Invite to party"
 msgstr ""
 
+#: src/gui/popups/popupmenu.cpp:2754
+#, c-format
+msgid "Join chat %s"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2762
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2756
+#: src/gui/popups/popupmenu.cpp:2779
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2761
+#: src/gui/popups/popupmenu.cpp:2784
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2819
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2851
+#: src/gui/popups/popupmenu.cpp:2874
 msgid "Drop all"
 msgstr "所有"
 
@@ -2166,7 +2172,7 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丢弃"
@@ -2174,49 +2180,49 @@ msgstr "丢弃"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2898
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:2906
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2911
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2891
+#: src/gui/popups/popupmenu.cpp:2914
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2894
+#: src/gui/popups/popupmenu.cpp:2917
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2925
 msgid "Kick"
 msgstr ""
 
@@ -2234,7 +2240,7 @@ msgstr "快捷键"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:317
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2262,10 +2268,10 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:339
+#: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "其他"
 
@@ -2321,7 +2327,7 @@ msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:106
+#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "怪物"
 
@@ -2504,25 +2510,129 @@ msgstr ""
 msgid "Open url"
 msgstr ""
 
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
+#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/input/pages/basic.cpp:210
+msgid "Quit"
+msgstr "退出"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:157
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
+#: src/gui/windows/statuswindow.cpp:747
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
+#: src/gui/windows/itemamountwindow.cpp:155
+#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
+#: src/gui/windows/statuswindow.cpp:760
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
+#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
+#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+msgid "Max"
+msgstr "最大"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
+#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "价格：%s / 总价：%s"
+
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:117
+#: src/gui/windows/serverdialog.cpp:125
 msgid "Edit"
 msgstr "编辑"
 
+#. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
+#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
-#: src/gui/widgets/skillinfo.cpp:99
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:102
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "类型:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy
+msgid "Unknown"
+msgstr "未知."
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:117
+msgid "Ground"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:122
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:127
+msgid "Unused"
+msgstr ""
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:132
+#, fuzzy
+msgid "Support"
+msgstr "挂机支持"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:137
+#, fuzzy
+msgid "Target trap"
+msgstr "目标类型:"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:141
+#, fuzzy
+msgid "Unknown:"
+msgstr "未知."
+
+#: src/gui/widgets/skillinfo.cpp:147
 #, c-format
-msgid "Mana: -%d"
+msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:153
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -3299,39 +3409,39 @@ msgid "No mods present"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:48
+#: src/gui/widgets/tabs/setup_other.cpp:50
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:50
+#: src/gui/widgets/tabs/setup_other.cpp:52
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/widgets/tabs/setup_other.cpp:52
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:60
+#: src/gui/widgets/tabs/setup_other.cpp:62
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:64
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/widgets/tabs/setup_other.cpp:69
+#: src/gui/widgets/tabs/setup_other.cpp:71
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_other.cpp:81
 #: src/gui/widgets/tabs/setup_visual.cpp:59
 #: src/gui/widgets/tabs/setup_visual.cpp:161
 msgid "low"
@@ -3339,234 +3449,234 @@ msgstr "低"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_other.cpp:83
 #: src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "medium"
 msgstr "中"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_other.cpp:85
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_other.cpp:85
+#: src/gui/widgets/tabs/setup_other.cpp:87
 #: src/gui/widgets/tabs/setup_visual.cpp:61
 #: src/gui/widgets/tabs/setup_visual.cpp:165
 msgid "high"
 msgstr "高"
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_other.cpp:89
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/widgets/tabs/setup_other.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:91
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/widgets/tabs/setup_other.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:101
 msgid "Misc"
 msgstr "杂项"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:109
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Show damage inflicted to monsters"
 msgstr "显示损坏造成的，以怪物"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:113
+#: src/gui/widgets/tabs/setup_other.cpp:115
 msgid "Auto target only reachable monsters"
 msgstr "自动目标只有到达怪物"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:117
+#: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Highlight monster attack range"
 msgstr "突出显示怪物的攻击范围"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:122
+#: src/gui/widgets/tabs/setup_other.cpp:124
 msgid "Show monster hp bar"
 msgstr "显示怪物HP栏"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:126
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Cycle monster targets"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:131 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
 msgstr "地图"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:134
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight map portals"
 msgstr "突出显示的地图门户网站"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:142
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Highlight floor items"
 msgstr "突出地板项目"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Highlight player attack range"
 msgstr "突出显示球员的攻击范围"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:150
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:154
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Draw path"
 msgstr "绘制路径"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:158
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:162
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:166
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:170
+#: src/gui/widgets/tabs/setup_other.cpp:172
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:174
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:178
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Play map animations"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:185
 msgid "Moving"
 msgstr "移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:186
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:190
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Show server side position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:194
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:198
+#: src/gui/widgets/tabs/setup_other.cpp:200
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:204
 msgid "Sync player move"
 msgstr "同步播放移动"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:208
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:212
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:215
+#: src/gui/widgets/tabs/setup_other.cpp:217
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/widgets/tabs/setup_other.cpp:217
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:221
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:225
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:229
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:233
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:237
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:243
 msgid "Show job"
 msgstr "显示工作"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:245
+#: src/gui/widgets/tabs/setup_other.cpp:247
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:251
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:255
 msgid "Enable advert protocol"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:257
+#: src/gui/widgets/tabs/setup_other.cpp:259
 msgid "Enabled pets support"
 msgstr ""
 
-#: src/gui/widgets/tabs/setup_other.cpp:260
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Enable weight notifications"
 msgstr ""
 
@@ -3574,173 +3684,179 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:265 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
 #: src/gui/windows/inventorywindow.cpp:195
 msgid "Shop"
 msgstr "商店"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:268
+#: src/gui/widgets/tabs/setup_other.cpp:270
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:272
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:277 src/gui/windows/npcdialog.cpp:86
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
 #: src/gui/windows/npcpostdialog.cpp:46
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:280
+#: src/gui/widgets/tabs/setup_other.cpp:282
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:284
+#: src/gui/widgets/tabs/setup_other.cpp:286
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:289
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Bots support"
 msgstr "挂机支持"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:292
+#: src/gui/widgets/tabs/setup_other.cpp:294
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:296
+#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:304
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:305
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:309
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:313
+#: src/gui/widgets/tabs/setup_other.cpp:315
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_other.cpp:323
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:326
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:334
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:342
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:346
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:350
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:354
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:358
+#: src/gui/widgets/tabs/setup_other.cpp:360
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:363
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:367
+#: src/gui/widgets/tabs/setup_other.cpp:369
+#, fuzzy
+msgid "Ignore logging packets"
+msgstr "忽略输入1"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:371
+#: src/gui/widgets/tabs/setup_other.cpp:377
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:375 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:383
+#: src/gui/widgets/tabs/setup_other.cpp:389
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:388
+#: src/gui/widgets/tabs/setup_other.cpp:394
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:400
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:399
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:403
+#: src/gui/widgets/tabs/setup_other.cpp:409
 msgid "Show background"
 msgstr "显示背景"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:408
+#: src/gui/widgets/tabs/setup_other.cpp:414
 msgid "Screen density override"
 msgstr ""
 
@@ -3972,7 +4088,7 @@ msgstr "允许密语"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
+#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4655,7 +4771,7 @@ msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:61
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
 msgid "Skills"
 msgstr "技能"
 
@@ -4666,7 +4782,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
 msgid "Social"
 msgstr ""
 
@@ -4760,75 +4876,19 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
-#: src/gui/windows/selldialog.cpp:115 src/gui/windows/selldialog.cpp:370
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "价格：%s / 总价：%s"
-
-#. TRANSLATORS: buy dialog label
 #: src/gui/windows/buydialog.cpp:250
 msgid "Amount:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/selldialog.cpp:119 src/gui/windows/statuswindow.cpp:747
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:258 src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/selldialog.cpp:121 src/gui/windows/statuswindow.cpp:760
-msgid "-"
-msgstr "-"
-
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:581
-#: src/gui/windows/socialwindow.cpp:85
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:579
+#: src/gui/windows/socialwindow.cpp:87
 msgid "Create"
 msgstr "建立"
 
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
-#: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
-#: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:204
-msgid "Quit"
-msgstr "退出"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/selldialog.cpp:127
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
-msgid "Max"
-msgstr "最大"
-
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:51
@@ -4850,19 +4910,19 @@ msgid "Type new email address twice:"
 msgstr "两次新的电子邮件地址:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:142
+#: src/gui/windows/changeemaildialog.cpp:140
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:150
+#: src/gui/windows/changeemaildialog.cpp:148
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:158
+#: src/gui/windows/changeemaildialog.cpp:156
 msgid "The email address entries mismatch."
 msgstr "电子邮件地址不匹配."
 
@@ -4880,7 +4940,7 @@ msgstr "更换密码"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
 #: src/gui/windows/unregisterdialog.cpp:69
 msgid "Password:"
 msgstr "密码:"
@@ -4891,29 +4951,29 @@ msgid "Type new password twice:"
 msgstr "输入两次新密码:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:123
+#: src/gui/windows/changepassworddialog.cpp:121
 msgid "Enter the old password first."
 msgstr "先输入旧密码."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:130
+#: src/gui/windows/changepassworddialog.cpp:128
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:138
+#: src/gui/windows/changepassworddialog.cpp:136
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:146
+#: src/gui/windows/changepassworddialog.cpp:144
 msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:78
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -4921,9 +4981,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/registerdialog.cpp:80
 msgid "Name:"
 msgstr "姓名:"
 
@@ -4931,11 +4991,11 @@ msgstr "姓名:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:88
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/charcreatedialog.cpp:194
-#: src/gui/windows/charcreatedialog.cpp:204
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
@@ -4944,72 +5004,72 @@ msgstr ">"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:92
-#: src/gui/windows/charcreatedialog.cpp:99
-#: src/gui/windows/charcreatedialog.cpp:196
-#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:94
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr "头发颜色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "发型:"
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:100
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:101
 msgid "Male"
 msgstr "帅哥"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/registerdialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:103
 msgid "Female"
 msgstr "美女"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:126
-#: src/gui/windows/charcreatedialog.cpp:482
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:208
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:372
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:488
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -5038,7 +5098,7 @@ msgstr "登录"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:576
+#: src/gui/windows/charselectdialog.cpp:574
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "开始"
@@ -5046,36 +5106,36 @@ msgstr "开始"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/charselectdialog.cpp:107
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:119
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:158
+#: src/gui/windows/charselectdialog.cpp:157
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:186
+#: src/gui/windows/charselectdialog.cpp:185
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:239
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5085,16 +5145,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:291
+#: src/gui/windows/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:431
+#: src/gui/windows/charselectdialog.cpp:430
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -5159,7 +5219,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:113
+#: src/gui/windows/serverdialog.cpp:121
 msgid "Connect"
 msgstr "连接"
 
@@ -5194,10 +5254,23 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:198
+#: src/gui/windows/editserverdialog.cpp:205
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:55
+#: src/gui/windows/eggselectiondialog.cpp:57
+#, fuzzy
+msgid "Select egg"
+msgstr "选择OK"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr ""
+
 #. TRANSLATORS: font size
 #: src/gui/windows/emotewindow.cpp:47
 msgid "Normal font"
@@ -5414,8 +5487,8 @@ msgstr "更改服务器"
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:56
-#: src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
+#: src/gui/windows/registerdialog.cpp:66
 msgid "Register"
 msgstr "注册"
 
@@ -5531,7 +5604,7 @@ msgstr "提交"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:115
+#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
 #: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -5552,6 +5625,17 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效."
 
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:79
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:81
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
 #, c-format
@@ -5579,107 +5663,96 @@ msgid "Switch character"
 msgstr "交换角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:83
+#: src/gui/windows/registerdialog.cpp:84
 msgid "Confirm:"
 msgstr "确认:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:123
+#: src/gui/windows/registerdialog.cpp:124
 msgid "Email:"
 msgstr "电子邮件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:194
+#: src/gui/windows/registerdialog.cpp:191
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:203
+#: src/gui/windows/registerdialog.cpp:200
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:212
-#: src/gui/windows/unregisterdialog.cpp:132
+#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/unregisterdialog.cpp:130
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:221
-#: src/gui/windows/unregisterdialog.cpp:139
+#: src/gui/windows/registerdialog.cpp:218
+#: src/gui/windows/unregisterdialog.cpp:137
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:229
+#: src/gui/windows/registerdialog.cpp:226
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#. TRANSLATORS: sell confirmation header
-#: src/gui/windows/selldialog.cpp:260
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/windows/selldialog.cpp:262
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:102
+#: src/gui/windows/serverdialog.cpp:110
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:129
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:135
+#: src/gui/windows/serverdialog.cpp:143
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:144
+#: src/gui/windows/serverdialog.cpp:152
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:396
+#: src/gui/windows/serverdialog.cpp:404
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:410
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:415
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:420
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:502
+#: src/gui/windows/serverdialog.cpp:510
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:507
+#: src/gui/windows/serverdialog.cpp:515
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -5727,159 +5800,159 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:792
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:70
+#: src/gui/windows/skilldialog.cpp:83
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:183
+#: src/gui/windows/skilldialog.cpp:193
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:253
+#: src/gui/windows/skilldialog.cpp:290
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/skilldialog.cpp:328
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:76
+#: src/gui/windows/socialwindow.cpp:78
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:81
+#: src/gui/windows/socialwindow.cpp:83
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/socialwindow.cpp:89
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:277
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:288
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:305
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:319
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:359
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:380
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:395
 msgid "Guild Name"
 msgstr "公会名称"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:397
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:413
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:421
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:428
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:502
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:511
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:513
 msgid "Choose your party's name."
 msgstr "选择n的名称."
 
@@ -6078,7 +6151,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -6088,17 +6161,17 @@ msgid "Update"
 msgstr "更新"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:228
+#: src/gui/windows/whoisonline.cpp:229
 msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:649
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:690
+#: src/gui/windows/whoisonline.cpp:691
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -6120,25 +6193,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:376
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:390
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:420
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6146,7 +6219,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -6222,71 +6295,77 @@ msgstr "目标玩家"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
+#, fuzzy
+msgid "Target mercenary"
+msgstr "目标:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:138
+#: src/input/pages/basic.cpp:144
 msgid "Other Keys"
 msgstr "其他按键"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Pickup"
 msgstr "捡起"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Screenshot"
 msgstr "屏幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Select OK"
 msgstr "选择OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -6494,11 +6573,6 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:93
-msgid "Select"
-msgstr ""
-
-#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:99
 msgid "Select2"
 msgstr ""
@@ -6843,6 +6917,11 @@ msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:368
+msgid "Fire your mercenary"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7216,92 +7295,62 @@ msgstr ""
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:73
-msgid "Strength:"
-msgstr "力量:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:75
-msgid "Agility:"
-msgstr "敏捷:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
-msgid "Vitality:"
-msgstr "生命:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
-msgid "Intelligence:"
-msgstr "智力:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
-msgid "Dexterity:"
-msgstr "灵巧:"
-
-#. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
-msgid "Luck:"
-msgstr "幸运:"
-
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:91
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:134
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:100
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:116
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:204
 msgid "Wrong name."
 msgstr "错误的名称."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:181
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect stats."
 msgstr "不正确的统计."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect hair."
 msgstr "不正确的头发."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:189
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:193
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:197
+#: src/net/ea/charserverhandler.cpp:141
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:220
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Character deleted."
 msgstr "角色已删除."
 
-#: src/net/ea/charserverhandler.cpp:233
+#: src/net/ea/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -7448,43 +7497,43 @@ msgstr "新密码太短."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:251
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Unknown error."
 msgstr "未知的错误."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
 msgid "Unregistered ID."
 msgstr "未注册的ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
 msgid "Wrong password."
 msgstr "错误的密码."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
 msgid "Account expired."
 msgstr "账户过期失效."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
 msgid "Client too old."
 msgstr "客户端太旧."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7494,22 +7543,22 @@ msgstr ""
 "请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7519,12 +7568,12 @@ msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:203
+#: src/net/ea/network.cpp:209
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:284
+#: src/net/ea/network.cpp:290
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止. "
 
@@ -7546,261 +7595,261 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:129
+#: src/net/ea/skillhandler.cpp:130
 msgid "Trade failed!"
 msgstr "交易失败!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:133
+#: src/net/ea/skillhandler.cpp:134
 msgid "Emote failed!"
 msgstr "发送表情失败!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:137
+#: src/net/ea/skillhandler.cpp:138
 msgid "Sit failed!"
 msgstr "原地休息失败!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Chat creating failed!"
 msgstr "聊天创建失败!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/skillhandler.cpp:146
 msgid "Could not join party!"
 msgstr "不能加入工会!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:149
+#: src/net/ea/skillhandler.cpp:150
 msgid "Cannot shout!"
 msgstr "无法呼喊!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:164
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:168
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:176
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:179
+#: src/net/ea/skillhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/skillhandler.cpp:188
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:196
+#: src/net/ea/skillhandler.cpp:197
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:200
+#: src/net/ea/skillhandler.cpp:201
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Huh? What's that?"
 msgstr "啊？那是什么?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:216
+#: src/net/ea/skillhandler.cpp:217
 msgid "Warp failed..."
 msgstr "传送失败..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:220
+#: src/net/ea/skillhandler.cpp:221
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:224
+#: src/net/ea/skillhandler.cpp:225
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
 msgid "Duplicated login."
 msgstr "重复登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
 msgid "Vitality"
 msgstr "生命"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
 msgid "Intelligence"
 msgstr "智慧"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
 msgid "Dexterity"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
@@ -7816,6 +7865,36 @@ msgstr "交易：您和%s"
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
 
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:350
+msgid "Strength:"
+msgstr "力量:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:352
+msgid "Agility:"
+msgstr "敏捷:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:354
+msgid "Vitality:"
+msgstr "生命:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:356
+msgid "Intelligence:"
+msgstr "智力:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:358
+msgid "Dexterity:"
+msgstr "灵巧:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:360
+msgid "Luck:"
+msgstr "幸运:"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7856,85 +7935,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:98
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:210
+#: src/resources/db/itemdb.cpp:211
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -8289,6 +8368,48 @@ msgstr ""
 msgid "Char is not online!"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:327
+#, fuzzy
+msgid "Pet catch failed."
+msgstr "身份验证失败."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:331
+msgid "Pet catched."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:335
+#, c-format
+msgid "Pet catch unkown error: %d."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "Your mercenary duty hour is over."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "Your mercenary was killed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "Your mercenary was fired."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "Your mercenary run away."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "Mercenary unknown state."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d39d5bafc..8491cc173 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr "創造"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "離開"
 
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
@@ -6215,66 +6215,71 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7798,7 +7803,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bc4e70fb6..f23c2b5bb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-10 21:55+0300\n"
-"PO-Revision-Date: 2014-09-11 10:12+0000\n"
+"POT-Creation-Date: 2014-09-13 11:49+0300\n"
+"PO-Revision-Date: 2014-09-14 09:59+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -4806,7 +4806,7 @@ msgstr "創造"
 #: src/gui/windows/buydialog.cpp:263 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:60 src/gui/windows/quitdialog.cpp:62
 #: src/gui/windows/selldialog.cpp:125 src/gui/windows/serverdialog.cpp:111
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Quit"
 msgstr "離開"
 
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "要求交易"
 
@@ -6215,66 +6215,71 @@ msgstr "以玩家為目標"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
 msgid "Pickup"
 msgstr "撿拾"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:144
+#: src/input/pages/basic.cpp:150
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Screenshot"
 msgstr "螢幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Select OK"
 msgstr "選擇確定"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Return to safe video mode"
 msgstr ""
 
@@ -7798,7 +7803,7 @@ msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:235
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
author	Andrei Karas <akaras@inbox.ru>	2014-09-22 22:27:28 +0300
committer	Andrei Karas <akaras@inbox.ru>	2014-09-22 22:27:28 +0300
commit	df9a0e97043897ee2919664067ed2e452a09c207 (patch)
tree	d605e019b3675917c1e00e094b8d6c45ac654675
parent	bad1fef12b5f113b7c05ab4c7f179002c3180dac (diff)
download	ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.gz ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.bz2 ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.tar.xz ManaVerse-df9a0e97043897ee2919664067ed2e452a09c207.zip